aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Wise <swise@opengridcomputing.com>2014-03-19 08:14:40 -0400
committerRoland Dreier <roland@purestorage.com>2014-03-20 12:59:04 -0400
commitebf00060c33b9d0946384fa6f440df7ea35a569e (patch)
tree7d579de555b1f3434e08b44cfbe3a6e4cbc340ed
parentf8e819081f797df355cffbdedb9301ea50ae76b2 (diff)
RDMA/cxgb4: Always release neigh entry
Always release the neigh entry in rx_pkt(). Based on original work by Santosh Rastapur <santosh@chelsio.com>. Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--drivers/infiniband/hw/cxgb4/cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 360807eaffec..2b2af962cc64 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -3347,13 +3347,13 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
3347 pi = (struct port_info *)netdev_priv(pdev); 3347 pi = (struct port_info *)netdev_priv(pdev);
3348 tx_chan = cxgb4_port_chan(pdev); 3348 tx_chan = cxgb4_port_chan(pdev);
3349 } 3349 }
3350 neigh_release(neigh);
3350 if (!e) { 3351 if (!e) {
3351 pr_err("%s - failed to allocate l2t entry!\n", 3352 pr_err("%s - failed to allocate l2t entry!\n",
3352 __func__); 3353 __func__);
3353 goto free_dst; 3354 goto free_dst;
3354 } 3355 }
3355 3356
3356 neigh_release(neigh);
3357 step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan; 3357 step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
3358 rss_qid = dev->rdev.lldi.rxq_ids[pi->port_id * step]; 3358 rss_qid = dev->rdev.lldi.rxq_ids[pi->port_id * step];
3359 window = (__force u16) htons((__force u16)tcph->window); 3359 window = (__force u16) htons((__force u16)tcph->window);