From 6aba487de94af3888a795b90935e12d8adac3024 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Fri, 20 Nov 2009 04:02:27 +0000 Subject: [PATCH] --- yaml --- r: 168933 b: refs/heads/master c: 30b768323f87bca15f14d6d146da397f98c29fe6 h: refs/heads/master i: 168931: 1c70cadc1c0a95476f18361a3e82195b53cdb988 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad11228e5b46..23848173bee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6440fe059ee8b49b548c8c2c1447530075d07e10 +refs/heads/master: 30b768323f87bca15f14d6d146da397f98c29fe6 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index a5036f7c1923..a456578b8578 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/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;