diff options
author | Greg Rose <gregory.v.rose@intel.com> | 2011-02-24 22:34:18 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-03-03 05:49:09 -0500 |
commit | c82a538e4ff101faae030273243d3b0a0a9e335d (patch) | |
tree | 2b55db513d681336d5afd44a0e9b1c9169ea44e4 /drivers/net/ixgbevf | |
parent | 3b668a77bad7f03c3df28971760a3883a395ce55 (diff) |
ixgbevf: Fix Compiler Warnings
Fix Compiler warnings of variables that are initialized but not used.
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbevf')
-rw-r--r-- | drivers/net/ixgbevf/ixgbevf_main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index 1e735a14091c..82768812552d 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c | |||
@@ -178,8 +178,6 @@ static inline bool ixgbevf_check_tx_hang(struct ixgbevf_adapter *adapter, | |||
178 | tx_ring->tx_buffer_info[eop].time_stamp && | 178 | tx_ring->tx_buffer_info[eop].time_stamp && |
179 | time_after(jiffies, tx_ring->tx_buffer_info[eop].time_stamp + HZ)) { | 179 | time_after(jiffies, tx_ring->tx_buffer_info[eop].time_stamp + HZ)) { |
180 | /* detected Tx unit hang */ | 180 | /* detected Tx unit hang */ |
181 | union ixgbe_adv_tx_desc *tx_desc; | ||
182 | tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop); | ||
183 | printk(KERN_ERR "Detected Tx Unit Hang\n" | 181 | printk(KERN_ERR "Detected Tx Unit Hang\n" |
184 | " Tx Queue <%d>\n" | 182 | " Tx Queue <%d>\n" |
185 | " TDH, TDT <%x>, <%x>\n" | 183 | " TDH, TDT <%x>, <%x>\n" |
@@ -334,7 +332,6 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, | |||
334 | struct ixgbevf_adapter *adapter = q_vector->adapter; | 332 | struct ixgbevf_adapter *adapter = q_vector->adapter; |
335 | bool is_vlan = (status & IXGBE_RXD_STAT_VP); | 333 | bool is_vlan = (status & IXGBE_RXD_STAT_VP); |
336 | u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); | 334 | u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); |
337 | int ret; | ||
338 | 335 | ||
339 | if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) { | 336 | if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) { |
340 | if (adapter->vlgrp && is_vlan) | 337 | if (adapter->vlgrp && is_vlan) |
@@ -345,9 +342,9 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, | |||
345 | napi_gro_receive(&q_vector->napi, skb); | 342 | napi_gro_receive(&q_vector->napi, skb); |
346 | } else { | 343 | } else { |
347 | if (adapter->vlgrp && is_vlan) | 344 | if (adapter->vlgrp && is_vlan) |
348 | ret = vlan_hwaccel_rx(skb, adapter->vlgrp, tag); | 345 | vlan_hwaccel_rx(skb, adapter->vlgrp, tag); |
349 | else | 346 | else |
350 | ret = netif_rx(skb); | 347 | netif_rx(skb); |
351 | } | 348 | } |
352 | } | 349 | } |
353 | 350 | ||
@@ -3287,8 +3284,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { | |||
3287 | 3284 | ||
3288 | static void ixgbevf_assign_netdev_ops(struct net_device *dev) | 3285 | static void ixgbevf_assign_netdev_ops(struct net_device *dev) |
3289 | { | 3286 | { |
3290 | struct ixgbevf_adapter *adapter; | ||
3291 | adapter = netdev_priv(dev); | ||
3292 | dev->netdev_ops = &ixgbe_netdev_ops; | 3287 | dev->netdev_ops = &ixgbe_netdev_ops; |
3293 | ixgbevf_set_ethtool_ops(dev); | 3288 | ixgbevf_set_ethtool_ops(dev); |
3294 | dev->watchdog_timeo = 5 * HZ; | 3289 | dev->watchdog_timeo = 5 * HZ; |