iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/dl-ipoib' into wip/dl-for-next

Browse Source 
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Doug Ledford 2018-05-31 12:05:01 -04:00
commit 01298c0cd4
1 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,62 +1054,42 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
path = __path_find(dev, phdr->hwaddr + 4); path = __path_find(dev, phdr->hwaddr + 4);
if (!path || !path->ah || !path->ah->valid) { if (!path || !path->ah || !path->ah->valid) {
int new_path = 0;
if (!path) { if (!path) {
path = path_rec_create(dev, phdr->hwaddr + 4); path = path_rec_create(dev, phdr->hwaddr + 4);
new_path = 1; if (!path)
} goto drop_and_unlock;
if (path) { __path_add(dev, path);
if (!new_path)
/* make sure there is no changes in the existing path record */
init_path_rec(priv, path, phdr->hwaddr + 4);
if (skb_queue_len(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
push_pseudo_header(skb, phdr->hwaddr);
__skb_queue_tail(&path->queue, skb);
} else {
++dev->stats.tx_dropped;
dev_kfree_skb_any(skb);
}
if (!path->query && path_rec_start(dev, path)) {
spin_unlock_irqrestore(&priv->lock, flags);
if (new_path)
path_free(dev, path);
return;
} else
__path_add(dev, path);
} else { } else {
/*
* make sure there are no changes in the existing
* path record
*/
init_path_rec(priv, path, phdr->hwaddr + 4);
}
if (!path->query && path_rec_start(dev, path)) {
goto drop_and_unlock; goto drop_and_unlock;
} }
spin_unlock_irqrestore(&priv->lock, flags); if (skb_queue_len(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
return; push_pseudo_header(skb, phdr->hwaddr);
} __skb_queue_tail(&path->queue, skb);
goto unlock;
if (path->ah && path->ah->valid) { } else {
ipoib_dbg(priv, "Send unicast ARP to %08x\n", goto drop_and_unlock;
be32_to_cpu(sa_path_get_dlid(&path->pathrec))); }
spin_unlock_irqrestore(&priv->lock, flags);
path->ah->last_send = rn->send(dev, skb, path->ah->ah,
IPOIB_QPN(phdr->hwaddr));
return;
} else if ((path->query || !path_rec_start(dev, path)) &&
skb_queue_len(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
push_pseudo_header(skb, phdr->hwaddr);
__skb_queue_tail(&path->queue, skb);
} else {
goto drop_and_unlock;
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
ipoib_dbg(priv, "Send unicast ARP to %08x\n",
be32_to_cpu(sa_path_get_dlid(&path->pathrec)));
path->ah->last_send = rn->send(dev, skb, path->ah->ah,
IPOIB_QPN(phdr->hwaddr));
return; return;
drop_and_unlock: drop_and_unlock:
++dev->stats.tx_dropped; ++dev->stats.tx_dropped;
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
unlock:
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }