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

Commit 20089ca5 authored by Roland Dreier's avatar Roland Dreier
Browse files

IPoIB/cm: Fix warning if IPV6 is not enabled 



Fix

    drivers/infiniband/ulp/ipoib/ipoib_cm.c:1151: warning: unused variable 'dev'

by getting rid of the variable dev, which is only used if CONFIG_IPV6
is enabled, and replacing the one use of it with the value it is
assigned, namely priv->dev.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 856c52a7

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+1 −2
Original line number Diff line number Diff line
@@ -1148,7 +1148,6 @@ static void ipoib_cm_skb_reap(struct work_struct *work) 
{

	struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,

						   cm.skb_task);

	struct net_device *dev = priv->dev;

	struct sk_buff *skb;



	unsigned mtu = priv->mcast_mtu;
@@ -1162,7 +1161,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work) 
			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

		else if (skb->protocol == htons(ETH_P_IPV6))

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev);

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, priv->dev);

#endif

		dev_kfree_skb_any(skb);

		spin_lock_irq(&priv->tx_lock);