aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2007-07-10 14:18:34 -0400
committerRoland Dreier <rolandd@cisco.com>2007-07-10 14:18:34 -0400
commit20089ca55786a243c7b72becd1bf670f4e2c2028 (patch)
tree76b0c517dfa9b4c74ccafac434e4095c7a836e45 /drivers/infiniband
parent856c52a741950dc0be2c5c231efec626e9a0a3fa (diff)
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: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_cm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index ea74d1eaf004..6764d216c887 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1148,7 +1148,6 @@ static void ipoib_cm_skb_reap(struct work_struct *work)
1148{ 1148{
1149 struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, 1149 struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,
1150 cm.skb_task); 1150 cm.skb_task);
1151 struct net_device *dev = priv->dev;
1152 struct sk_buff *skb; 1151 struct sk_buff *skb;
1153 1152
1154 unsigned mtu = priv->mcast_mtu; 1153 unsigned mtu = priv->mcast_mtu;
@@ -1162,7 +1161,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work)
1162 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu)); 1161 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));
1163#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 1162#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
1164 else if (skb->protocol == htons(ETH_P_IPV6)) 1163 else if (skb->protocol == htons(ETH_P_IPV6))
1165 icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev); 1164 icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, priv->dev);
1166#endif 1165#endif
1167 dev_kfree_skb_any(skb); 1166 dev_kfree_skb_any(skb);
1168 spin_lock_irq(&priv->tx_lock); 1167 spin_lock_irq(&priv->tx_lock);