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: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

7 files changed, 52 insertions, 95 deletions

diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c
index 674f836e225..91f50de84be 100644
--- a/drivers/net/mlx4/en_cq.c
+++ b/drivers/net/mlx4/en_cq.c
@@ -71,6 +71,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
         err = mlx4_en_map_buffer(&cq->wqres.buf);
         if (err)
                 mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
+        else
+                cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf;
 
         return err;
 }
@@ -85,7 +87,6 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
         cq->mcq.arm_db     = cq->wqres.db.db + 1;
         *cq->mcq.set_ci_db = 0;
         *cq->mcq.arm_db    = 0;
-        cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf;
         memset(cq->buf, 0, cq->buf_size);
 
         err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar,
@@ -139,7 +140,6 @@ int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 
 int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 {
-        cq->armed = 1;
         mlx4_cq_arm(&cq->mcq, MLX4_CQ_DB_REQ_NOT, priv->mdev->uar_map,
                     &priv->mdev->uar_lock);
 
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 96e709d6440..ebada3c7aff 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -369,7 +369,6 @@ static struct net_device_stats *mlx4_en_get_stats(struct net_device *dev)
 
 static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 {
-        struct mlx4_en_dev *mdev = priv->mdev;
         struct mlx4_en_cq *cq;
         int i;
 
@@ -379,15 +378,8 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
          *   satisfy our coelsing target.
          * - moder_time is set to a fixed value.
          */
-        priv->rx_frames = (mdev->profile.rx_moder_cnt ==
-                           MLX4_EN_AUTO_CONF) ?
-                                MLX4_EN_RX_COAL_TARGET /
-                                priv->dev->mtu + 1 :
-                                mdev->profile.rx_moder_cnt;
-        priv->rx_usecs = (mdev->profile.rx_moder_time ==
-                          MLX4_EN_AUTO_CONF) ?
-                                MLX4_EN_RX_COAL_TIME :
-                                mdev->profile.rx_moder_time;
+        priv->rx_frames = MLX4_EN_RX_COAL_TARGET / priv->dev->mtu + 1;
+        priv->rx_usecs = MLX4_EN_RX_COAL_TIME;
         mlx4_dbg(INTR, priv, "Default coalesing params for mtu:%d - "
                              "rx_frames:%d rx_usecs:%d\n",
                  priv->dev->mtu, priv->rx_frames, priv->rx_usecs);
@@ -411,7 +403,7 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
         priv->pkt_rate_high = MLX4_EN_RX_RATE_HIGH;
         priv->rx_usecs_high = MLX4_EN_RX_COAL_TIME_HIGH;
         priv->sample_interval = MLX4_EN_SAMPLE_INTERVAL;
-        priv->adaptive_rx_coal = mdev->profile.auto_moder;
+        priv->adaptive_rx_coal = 1;
         priv->last_moder_time = MLX4_EN_AUTO_CONF;
         priv->last_moder_jiffies = 0;
         priv->last_moder_packets = 0;
@@ -953,6 +945,23 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+static const struct net_device_ops mlx4_netdev_ops = {
+        .ndo_open               = mlx4_en_open,
+        .ndo_stop               = mlx4_en_close,
+        .ndo_start_xmit         = mlx4_en_xmit,
+        .ndo_get_stats          = mlx4_en_get_stats,
+        .ndo_set_multicast_list = mlx4_en_set_multicast,
+        .ndo_set_mac_address    = mlx4_en_set_mac,
+        .ndo_change_mtu         = mlx4_en_change_mtu,
+        .ndo_tx_timeout         = mlx4_en_tx_timeout,
+        .ndo_vlan_rx_register   = mlx4_en_vlan_rx_register,
+        .ndo_vlan_rx_add_vid    = mlx4_en_vlan_rx_add_vid,
+        .ndo_vlan_rx_kill_vid   = mlx4_en_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = mlx4_en_netpoll,
+#endif
+};
+
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                         struct mlx4_en_port_profile *prof)
 {
@@ -1029,22 +1038,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         /*
          * Initialize netdev entry points
          */
-
-        dev->open = &mlx4_en_open;
-        dev->stop = &mlx4_en_close;
-        dev->hard_start_xmit = &mlx4_en_xmit;
-        dev->get_stats = &mlx4_en_get_stats;
-        dev->set_multicast_list = &mlx4_en_set_multicast;
-        dev->set_mac_address = &mlx4_en_set_mac;
-        dev->change_mtu = &mlx4_en_change_mtu;
-        dev->tx_timeout = &mlx4_en_tx_timeout;
+        dev->netdev_ops = &mlx4_netdev_ops;
         dev->watchdog_timeo = MLX4_EN_WATCHDOG_TIMEOUT;
-        dev->vlan_rx_register = mlx4_en_vlan_rx_register;
-        dev->vlan_rx_add_vid = mlx4_en_vlan_rx_add_vid;
-        dev->vlan_rx_kill_vid = mlx4_en_vlan_rx_kill_vid;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = mlx4_en_netpoll;
-#endif
+
         SET_ETHTOOL_OPS(dev, &mlx4_en_ethtool_ops);
 
         /* Set defualt MAC */
diff --git a/drivers/net/mlx4/en_params.c b/drivers/net/mlx4/en_params.c
index 95706ee1c01..047b37f5a74 100644
--- a/drivers/net/mlx4/en_params.c
+++ b/drivers/net/mlx4/en_params.c
@@ -60,24 +60,11 @@ MLX4_EN_PARM_INT(num_lro, MLX4_EN_MAX_LRO_DESCRIPTORS,
                  "Number of LRO sessions per ring or disabled (0)");
 
 /* Priority pausing */
-MLX4_EN_PARM_INT(pptx, MLX4_EN_DEF_TX_PAUSE,
-                 "Pause policy on TX: 0 never generate pause frames "
-                 "1 generate pause frames according to RX buffer threshold");
-MLX4_EN_PARM_INT(pprx, MLX4_EN_DEF_RX_PAUSE,
-                 "Pause policy on RX: 0 ignore received pause frames "
-                 "1 respect received pause frames");
 MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]."
                            " Per priority bit mask");
 MLX4_EN_PARM_INT(pfcrx, 0, "Priority based Flow Control policy on RX[7:0]."
                            " Per priority bit mask");
 
-/* Interrupt moderation tunning */
-MLX4_EN_PARM_INT(rx_moder_cnt, MLX4_EN_AUTO_CONF,
-               "Max coalesced descriptors for Rx interrupt moderation");
-MLX4_EN_PARM_INT(rx_moder_time, MLX4_EN_AUTO_CONF,
-               "Timeout following last packet for Rx interrupt moderation");
-MLX4_EN_PARM_INT(auto_moder, 1, "Enable dynamic interrupt moderation");
-
 MLX4_EN_PARM_INT(rx_ring_num1, 0, "Number or Rx rings for port 1 (0 = #cores)");
 MLX4_EN_PARM_INT(rx_ring_num2, 0, "Number or Rx rings for port 2 (0 = #cores)");
 
@@ -92,16 +79,13 @@ int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
         struct mlx4_en_profile *params = &mdev->profile;
         int i;
 
-        params->rx_moder_cnt = min_t(int, rx_moder_cnt, MLX4_EN_AUTO_CONF);
-        params->rx_moder_time = min_t(int, rx_moder_time, MLX4_EN_AUTO_CONF);
-        params->auto_moder = auto_moder;
         params->rss_xor = (rss_xor != 0);
         params->rss_mask = rss_mask & 0x1f;
         params->num_lro = min_t(int, num_lro , MLX4_EN_MAX_LRO_DESCRIPTORS);
         for (i = 1; i <= MLX4_MAX_PORTS; i++) {
-                params->prof[i].rx_pause = pprx;
+                params->prof[i].rx_pause = 1;
                 params->prof[i].rx_ppp = pfcrx;
-                params->prof[i].tx_pause = pptx;
+                params->prof[i].tx_pause = 1;
                 params->prof[i].tx_ppp = pfctx;
         }
         if (pfcrx || pfctx) {
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 6232227f56c..c61b0bdca1a 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -443,7 +443,8 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                 /* Fill Rx buffers */
                 ring->full = 0;
         }
-        if (mlx4_en_fill_rx_buffers(priv))
+        err = mlx4_en_fill_rx_buffers(priv);
+        if (err)
                 goto err_buffers;
 
         for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
@@ -776,8 +777,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                 } else
                         netif_receive_skb(skb);
 
-                dev->last_rx = jiffies;
-
 next:
                 ++cq->mcq.cons_index;
                 index = (cq->mcq.cons_index) & ring->size_mask;
@@ -815,7 +814,7 @@ void mlx4_en_rx_irq(struct mlx4_cq *mcq)
         struct mlx4_en_priv *priv = netdev_priv(cq->dev);
 
         if (priv->port_up)
-                netif_rx_schedule(cq->dev, &cq->napi);
+                netif_rx_schedule(&cq->napi);
         else
                 mlx4_en_arm_cq(priv, cq);
 }
@@ -835,7 +834,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
                 INC_PERF_COUNTER(priv->pstats.napi_quota);
         else {
                 /* Done for now */
-                netif_rx_complete(dev, napi);
+                netif_rx_complete(napi);
                 mlx4_en_arm_cq(priv, cq);
         }
         return done;
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 8592f8fb847..ff4d75205c2 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -379,8 +379,8 @@ static void mlx4_en_process_tx_cq(struct net_device *dev, struct mlx4_en_cq *cq)
 
         /* Wakeup Tx queue if this ring stopped it */
         if (unlikely(ring->blocked)) {
-                if (((u32) (ring->prod - ring->cons) <=
-                     ring->size - HEADROOM - MAX_DESC_TXBBS) && !cq->armed) {
+                if ((u32) (ring->prod - ring->cons) <=
+                     ring->size - HEADROOM - MAX_DESC_TXBBS) {
 
                         /* TODO: support multiqueue netdevs. Currently, we block
                          * when *any* ring is full. Note that:
@@ -404,14 +404,11 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq)
         struct mlx4_en_priv *priv = netdev_priv(cq->dev);
         struct mlx4_en_tx_ring *ring = &priv->tx_ring[cq->ring];
 
-        spin_lock_irq(&ring->comp_lock);
-        cq->armed = 0;
+        if (!spin_trylock(&ring->comp_lock))
+                return;
         mlx4_en_process_tx_cq(cq->dev, cq);
-        if (ring->blocked)
-                mlx4_en_arm_cq(priv, cq);
-        else
-                mod_timer(&cq->timer, jiffies + 1);
-        spin_unlock_irq(&ring->comp_lock);
+        mod_timer(&cq->timer, jiffies + 1);
+        spin_unlock(&ring->comp_lock);
 }
 
 
@@ -424,8 +421,10 @@ void mlx4_en_poll_tx_cq(unsigned long data)
 
         INC_PERF_COUNTER(priv->pstats.tx_poll);
 
-        netif_tx_lock(priv->dev);
-        spin_lock_irq(&ring->comp_lock);
+        if (!spin_trylock(&ring->comp_lock)) {
+                mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT);
+                return;
+        }
         mlx4_en_process_tx_cq(cq->dev, cq);
         inflight = (u32) (ring->prod - ring->cons - ring->last_nr_txbb);
 
@@ -435,8 +434,7 @@ void mlx4_en_poll_tx_cq(unsigned long data)
         if (inflight && priv->port_up)
                 mod_timer(&cq->timer, jiffies + MLX4_EN_TX_POLL_TIMEOUT);
 
-        spin_unlock_irq(&ring->comp_lock);
-        netif_tx_unlock(priv->dev);
+        spin_unlock(&ring->comp_lock);
 }
 
 static struct mlx4_en_tx_desc *mlx4_en_bounce_to_desc(struct mlx4_en_priv *priv,
@@ -479,7 +477,10 @@ static inline void mlx4_en_xmit_poll(struct mlx4_en_priv *priv, int tx_ind)
 
         /* Poll the CQ every mlx4_en_TX_MODER_POLL packets */
         if ((++ring->poll_cnt & (MLX4_EN_TX_POLL_MODER - 1)) == 0)
-                mlx4_en_process_tx_cq(priv->dev, cq);
+                if (spin_trylock(&ring->comp_lock)) {
+                        mlx4_en_process_tx_cq(priv->dev, cq);
+                        spin_unlock(&ring->comp_lock);
+                }
 }
 
 static void *get_frag_ptr(struct sk_buff *skb)
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 592c01ae2c5..6053c357a47 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -118,17 +118,7 @@ static int find_mgm(struct mlx4_dev *dev,
                 return err;
 
         if (0)
-                mlx4_dbg(dev, "Hash for %04x:%04x:%04x:%04x:"
-                          "%04x:%04x:%04x:%04x is %04x\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]),
-                          *hash);
+                mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
         *index = *hash;
         *prev  = -1;
@@ -215,7 +205,7 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
         if (block_mcast_loopback)
                 mgm->qp[members_count++] = cpu_to_be32((qp->qpn & MGM_QPN_MASK) |
-                                                       (1 << MGM_BLCK_LB_BIT));
+                                                       (1U << MGM_BLCK_LB_BIT));
         else
                 mgm->qp[members_count++] = cpu_to_be32(qp->qpn & MGM_QPN_MASK);
 
@@ -277,16 +267,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
                 goto out;
 
         if (index == -1) {
-                mlx4_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                          "not found\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]));
+                mlx4_err(dev, "MGID %pI6 not found\n", gid);
                 err = -EINVAL;
                 goto out;
         }
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index 98ddc0811f9..e78209768de 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -58,17 +58,17 @@
 #define mlx4_dbg(mlevel, priv, format, arg...)  \
         if (NETIF_MSG_##mlevel & priv->msg_enable) \
         printk(KERN_DEBUG "%s %s: " format , DRV_NAME ,\
-                (&priv->mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&priv->mdev->pdev->dev)) , ## arg)
 
 #define mlx4_err(mdev, format, arg...) \
         printk(KERN_ERR "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 #define mlx4_info(mdev, format, arg...) \
         printk(KERN_INFO "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 #define mlx4_warn(mdev, format, arg...) \
         printk(KERN_WARNING "%s %s: " format , DRV_NAME ,\
-                (&mdev->pdev->dev)->bus_id , ## arg)
+                (dev_name(&mdev->pdev->dev)) , ## arg)
 
 /*
  * Device constants
@@ -311,7 +311,6 @@ struct mlx4_en_cq {
         enum cq_type is_tx;
         u16 moder_time;
         u16 moder_cnt;
-        int armed;
         struct mlx4_cqe *buf;
 #define MLX4_EN_OPCODE_ERROR    0x1e
 };
@@ -334,9 +333,6 @@ struct mlx4_en_profile {
         u8 rss_mask;
         u32 active_ports;
         u32 small_pkt_int;
-        int rx_moder_cnt;
-        int rx_moder_time;
-        int auto_moder;
         u8 no_reset;
         struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
 };