Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d70ed607 authored by Roland Dreier's avatar Roland Dreier
Browse files

[IPoIB] Rename IPoIB's path_lookup() to avoid name clashes 



Rename IPoIB driver's path_lookup() to ipoib_path_lookup() to avoid a
clashes with the kernel global path_lookup().  We don't hit this with
the current kernel source, but some external patches seem to trigger
this, and it's cleaner to avoid clashing with global names anyway.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
refs/heads/for-linus
parent a1c337af

drivers/infiniband/ulp/ipoib/ipoib_main.c

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev) 
	spin_unlock(&priv->lock);

}



static void path_lookup(struct sk_buff *skb, struct net_device *dev)

static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(skb->dev);
@@ -569,7 +569,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	if (skb->dst && skb->dst->neighbour) {

		if (unlikely(!*to_ipoib_neigh(skb->dst->neighbour))) {

			path_lookup(skb, dev);

			ipoib_path_lookup(skb, dev);

			goto out;

		}