Mailing List Archive: Linux: Kernel

[PATCH] ixgbe: move tc variable to CONFIG_IXGBE_DCB

Index | Next | Previous | View Threaded

jaswinder at kernel

Nov 20, 2009, 6:02 AM

Post #1 of 5 (163 views)
Permalink

[PATCH] 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 [at] gmail>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

jeffrey.t.kirsher at intel

Nov 20, 2009, 6:24 AM

Post #2 of 5 (149 views)
Permalink

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

On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
<jaswinder [at] kernel> 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 [at] gmail>
> ---
> Â 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

davem at davemloft

Nov 20, 2009, 11:13 AM

Post #3 of 5 (140 views)
Permalink

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

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

> On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
> <jaswinder [at] kernel> 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 [at] gmail>
...
> 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.

¢éì¹»®&Þ~º&¶¬–+-±éÝ¶¥Šw®žË›±Êâmébžìdz¹Þ–)í…æèw*jg¬±¨¶‰šŽŠÝ¢j/êäz¹Þ–Šà2ŠÞ™¨èÚ&¢)ß¡«a¶Úþø®G«éh®æj:+v‰¨Šwè†Ù¥>Wš±êÞiÛaxPjØm¶ŸÿÃ-»+ƒùdš_

jeffrey.t.kirsher at intel

Nov 20, 2009, 11:16 AM

Post #4 of 5 (141 views)
Permalink

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

On Fri, Nov 20, 2009 at 11:13, David Miller <davem [at] davemloft> wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher [at] intel>
> Date: Fri, 20 Nov 2009 06:24:21 -0800
>
>> On Fri, Nov 20, 2009 at 06:02, Jaswinder Singh Rajput
>> <jaswinder [at] kernel> 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 [at] gmail>
> Â ...
>> 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 [at] intel>

--
Cheers,
Jeff
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

davem at davemloft

Nov 20, 2009, 1:47 PM

Post #5 of 5 (146 views)
Permalink

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

From: Jeff Kirsher <jeffrey.t.kirsher [at] intel>
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 [at] intel>

Great, applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads