diff options
| author | Roland Dreier <rolandd@cisco.com> | 2007-07-10 20:18:34 +0200 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-07-10 20:18:34 +0200 |
| commit | 20089ca55786a243c7b72becd1bf670f4e2c2028 (patch) | |
| tree | 76b0c517dfa9b4c74ccafac434e4095c7a836e45 /drivers/infiniband | |
| parent | IB/core: Take sizeof the correct pointer when calling kmalloc() (diff) | |
| download | linux-20089ca55786a243c7b72becd1bf670f4e2c2028.tar.xz linux-20089ca55786a243c7b72becd1bf670f4e2c2028.zip | |
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.c | 3 |
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) { 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); |