ixgbevf: Fix Compiler Warnings
authorGreg Rose <gregory.v.rose@intel.com>
Fri, 25 Feb 2011 03:34:18 +0000 (03:34 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 3 Mar 2011 10:49:09 +0000 (02:49 -0800)
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>
drivers/net/ixgbevf/ixgbevf_main.c

index 1e735a14091c36be635396dddcf14810b348634d..82768812552de98a464cfa8eb4ef5a0b41ac72bb 100644 (file)
@@ -178,8 +178,6 @@ static inline bool ixgbevf_check_tx_hang(struct ixgbevf_adapter *adapter,
            tx_ring->tx_buffer_info[eop].time_stamp &&
            time_after(jiffies, tx_ring->tx_buffer_info[eop].time_stamp + HZ)) {
                /* detected Tx unit hang */
-               union ixgbe_adv_tx_desc *tx_desc;
-               tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
                printk(KERN_ERR "Detected Tx Unit Hang\n"
                       "  Tx Queue             <%d>\n"
                       "  TDH, TDT             <%x>, <%x>\n"
@@ -334,7 +332,6 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
        struct ixgbevf_adapter *adapter = q_vector->adapter;
        bool is_vlan = (status & IXGBE_RXD_STAT_VP);
        u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
-       int ret;
 
        if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) {
                if (adapter->vlgrp && is_vlan)
@@ -345,9 +342,9 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
                        napi_gro_receive(&q_vector->napi, skb);
        } else {
                if (adapter->vlgrp && is_vlan)
-                       ret = vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
+                       vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
                else
-                       ret = netif_rx(skb);
+                       netif_rx(skb);
        }
 }
 
@@ -3287,8 +3284,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
 
 static void ixgbevf_assign_netdev_ops(struct net_device *dev)
 {
-       struct ixgbevf_adapter *adapter;
-       adapter = netdev_priv(dev);
        dev->netdev_ops = &ixgbe_netdev_ops;
        ixgbevf_set_ethtool_ops(dev);
        dev->watchdog_timeo = 5 * HZ;