[PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[Jaswinder Singh Rajput]

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>
---
 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 ebcec30..61a02ce 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -242,11 +242,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;
 
-- 
1.6.5.3

Re: [PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[Jeff Kirsher]

On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
<jaswinder@kernel.org> wrote:
>
> 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>
> ---
>  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 ebcec30..61a02ce 100644
> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -242,11 +242,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;
>
> --
> 1.6.5.3
>
>
> --

I just submitted a patch to fix this.  So NAK.

-- 
Cheers,
Jeff

Re: [PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[David Miller]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=utf-8, Size: 803 bytes --]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 20 Nov 2009 06:24:21 -0800

> On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
> <jaswinder@kernel.org> wrote:
>>
>> 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>
 ...
> I just submitted a patch to fix this.  So NAK.

But his is much cleaner that your's, less ifdefs.  I think we
should therefore use Jasdinder's version.

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[Jeff Kirsher]

On Fri, Nov 20, 2009 at 11:13, David Miller <davem@davemloft.net> wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri, 20 Nov 2009 06:24:21 -0800
>
>> On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
>> <jaswinder@kernel.org> wrote:
>>>
>>> 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>
>  ...
>> I just submitted a patch to fix this.  So NAK.
>
> But his is much cleaner that your's, less ifdefs.  I think we
> should therefore use Jasdinder's version.
>
>

:) That is fine.  The end result is the same.

Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

-- 
Cheers,
Jeff

Re: [PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 20 Nov 2009 11:16:54 -0800

> :) That is fine.  The end result is the same.
> 
> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Great, applied.