IPoIB: Handle bonding failover race for connected neighbours too
Move up the code that checks for a situation where the remote GID stored in the ipoib_neigh is different than the one present in the neighbour (handle gratuitous ARP) or that a bonding fail over has happened but the neighbour still has a pointer to an ipoib_neigh created by a different device than the current slave. This will cause the driver to apply the check also for connected mode neighbours. Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
0d89fe2c0c
commit
bafff97417
|
@ -680,12 +680,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
|
|
||||||
neigh = *to_ipoib_neigh(skb->dst->neighbour);
|
neigh = *to_ipoib_neigh(skb->dst->neighbour);
|
||||||
|
|
||||||
if (ipoib_cm_get(neigh)) {
|
if (neigh->ah)
|
||||||
if (ipoib_cm_up(neigh)) {
|
|
||||||
ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
} else if (neigh->ah) {
|
|
||||||
if (unlikely((memcmp(&neigh->dgid.raw,
|
if (unlikely((memcmp(&neigh->dgid.raw,
|
||||||
skb->dst->neighbour->ha + 4,
|
skb->dst->neighbour->ha + 4,
|
||||||
sizeof(union ib_gid))) ||
|
sizeof(union ib_gid))) ||
|
||||||
|
@ -706,6 +701,12 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ipoib_cm_get(neigh)) {
|
||||||
|
if (ipoib_cm_up(neigh)) {
|
||||||
|
ipoib_cm_send(dev, skb, ipoib_cm_get(neigh));
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
} else if (neigh->ah) {
|
||||||
ipoib_send(dev, skb, neigh->ah, IPOIB_QPN(skb->dst->neighbour->ha));
|
ipoib_send(dev, skb, neigh->ah, IPOIB_QPN(skb->dst->neighbour->ha));
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue