| Message ID | 1258725747.3562.5.camel@ht.satnam |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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.
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.
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>
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)