cxgb3: Convert t3_l2t_get() over to dst_neigh_lookup().

This means passing in a suitable destination address.

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 17 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 740dcc065cf2..77b6b182778a 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1374,7 +1374,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
                 goto reject;
         }
         dst = &rt->dst;
-        l2t = t3_l2t_get(tdev, dst, NULL);
+        l2t = t3_l2t_get(tdev, dst, NULL, &req->peer_ip);
         if (!l2t) {
                 printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
                        __func__);
@@ -1942,7 +1942,8 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 goto fail3;
         }
         ep->dst = &rt->dst;
-        ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL);
+        ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL,
+                             &cm_id->remote_addr.sin_addr.s_addr);
         if (!ep->l2t) {
                 printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
                 err = -ENOMEM;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 633c6029e53c..2dbbcbb450d3 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -63,7 +63,8 @@ static const unsigned int ATID_BASE = 0x10000;
 
 static void cxgb_neigh_update(struct neighbour *neigh);
 static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
-                          struct dst_entry *new, struct neighbour *new_neigh);
+                          struct dst_entry *new, struct neighbour *new_neigh,
+                          const void *daddr);
 
 static inline int offload_activated(struct t3cdev *tdev)
 {
@@ -970,7 +971,8 @@ static int nb_callback(struct notifier_block *self, unsigned long event,
         case (NETEVENT_REDIRECT):{
                 struct netevent_redirect *nr = ctx;
                 cxgb_redirect(nr->old, nr->old_neigh,
-                              nr->new, nr->new_neigh);
+                              nr->new, nr->new_neigh,
+                              nr->daddr);
                 cxgb_neigh_update(nr->new_neigh);
                 break;
         }
@@ -1110,7 +1112,8 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)
 }
 
 static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
-                          struct dst_entry *new, struct neighbour *new_neigh)
+                          struct dst_entry *new, struct neighbour *new_neigh,
+                          const void *daddr)
 {
         struct net_device *olddev, *newdev;
         struct tid_info *ti;
@@ -1139,7 +1142,7 @@ static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
         }
 
         /* Add new L2T entry */
-        e = t3_l2t_get(tdev, new, newdev);
+        e = t3_l2t_get(tdev, new, newdev, daddr);
         if (!e) {
                 printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n",
                        __func__);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
index 3fa3c8833ed7..8d53438638b2 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -299,7 +299,7 @@ static inline void reuse_entry(struct l2t_entry *e, struct neighbour *neigh)
 }
 
 struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
-                             struct net_device *dev)
+                             struct net_device *dev, const void *daddr)
 {
         struct l2t_entry *e = NULL;
         struct neighbour *neigh;
@@ -311,7 +311,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
         int smt_idx;
 
         rcu_read_lock();
-        neigh = dst_get_neighbour_noref(dst);
+        neigh = dst_neigh_lookup(dst, daddr);
         if (!neigh)
                 goto done_rcu;
 
@@ -360,6 +360,8 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
 done_unlock:
         write_unlock_bh(&d->lock);
 done_rcu:
+        if (neigh)
+                neigh_release(neigh);
         rcu_read_unlock();
         return e;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
index c4e864369751..8cffcdfd5678 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
@@ -110,7 +110,7 @@ static inline void set_arp_failure_handler(struct sk_buff *skb,
 void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e);
 void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh);
 struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
-                             struct net_device *dev);
+                             struct net_device *dev, const void *daddr);
 int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb,
                      struct l2t_entry *e);
 void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e);
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index 36739da8bc15..49692a1ac44a 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -966,7 +966,8 @@ static int init_act_open(struct cxgbi_sock *csk)
                 csk->saddr.sin_addr.s_addr = chba->ipv4addr;
 
         csk->rss_qid = 0;
-        csk->l2t = t3_l2t_get(t3dev, dst, ndev);
+        csk->l2t = t3_l2t_get(t3dev, dst, ndev,
+                              &csk->daddr.sin_addr.s_addr);
         if (!csk->l2t) {
                 pr_err("NO l2t available.\n");
                 return -EINVAL;