diff options
| author | Jaswinder Singh Rajput <jaswinder@kernel.org> | 2009-11-20 05:02:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-20 22:47:27 +0100 |
| commit | 30b768323f87bca15f14d6d146da397f98c29fe6 (patch) | |
| tree | 070b48e887a7891c5e9a6799155ac3a05ee56b95 /drivers/net | |
| parent | netfilter: nf_log: fix sleeping function called from invalid context in seq_s... (diff) | |
| download | linux-30b768323f87bca15f14d6d146da397f98c29fe6.tar.xz linux-30b768323f87bca15f14d6d146da397f98c29fe6.zip | |
ixgbe: move tc variable to CONFIG_IXGBE_DCB
tc is required by CONFIG_IXGBE_DCB.
This also fixes compilation warning:
drivers/net/ixgbe/ixgbe_main.c: In function ‘ixgbe_tx_is_paused’:
drivers/net/ixgbe/ixgbe_main.c:245: warning: unused variable ‘tc’
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index a5036f7c1923..a456578b8578 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -240,11 +240,11 @@ static void ixgbe_unmap_and_free_tx_resource(struct ixgbe_adapter *adapter, static inline bool ixgbe_tx_is_paused(struct ixgbe_adapter *adapter, struct ixgbe_ring *tx_ring) { - int tc; u32 txoff = IXGBE_TFCS_TXOFF; #ifdef CONFIG_IXGBE_DCB if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { + int tc; int reg_idx = tx_ring->reg_idx; int dcb_i = adapter->ring_feature[RING_F_DCB].indices; |