lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipoib: Convert over to dev_lookup_neigh_skb().

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2012-07-02 22:00:03 -07:00
parent dbedbe6d56
commit 178709bbfe
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@@ -715,7 +715,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
rcu_read_lock(); rcu_read_lock();
if (likely(skb_dst(skb))) { if (likely(skb_dst(skb))) {
n = dst_get_neighbour_noref(skb_dst(skb)); n = dst_neigh_lookup_skb(skb_dst(skb), skb);
if (!n) { if (!n) {
++dev->stats.tx_dropped; ++dev->stats.tx_dropped;
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
@@ -797,6 +797,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
} }
} }
unlock: unlock:
if (n)
neigh_release(n);
rcu_read_unlock(); rcu_read_unlock();
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }

14
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
View File

@@ -720,17 +720,21 @@ out:
rcu_read_lock(); rcu_read_lock();
if (dst) if (dst)
n = dst_get_neighbour_noref(dst); n = dst_neigh_lookup_skb(dst, skb);
if (n && !*to_ipoib_neigh(n)) { if (n) {
struct ipoib_neigh *neigh = ipoib_neigh_alloc(n, if (!*to_ipoib_neigh(n)) {
skb->dev); struct ipoib_neigh *neigh;
neigh = ipoib_neigh_alloc(n, skb->dev);
if (neigh) { if (neigh) {
kref_get(&mcast->ah->ref); kref_get(&mcast->ah->ref);
neigh->ah = mcast->ah; neigh->ah = mcast->ah;
list_add_tail(&neigh->list, &mcast->neigh_list); list_add_tail(&neigh->list,
&mcast->neigh_list);
} }
} }
neigh_release(n);
}
rcu_read_unlock(); rcu_read_unlock();
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN); ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN);