* [Patch net] igb: fix a typo in igb_reset_q_vector()
@ 2015-04-21 23:20 Cong Wang
2015-04-22 0:18 ` Jeff Kirsher
2015-04-22 0:26 ` Toshiaki Makita
0 siblings, 2 replies; 6+ messages in thread
From: Cong Wang @ 2015-04-21 23:20 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Alexander Duyck, Jeff Kirsher
Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a single function")
Cc: Alexander Duyck <alexander.h.duyck@redhat.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 8457d03..85bbeb2 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
if (q_vector->rx.ring)
- adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;
+ adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
netif_napi_del(&q_vector->napi);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Patch net] igb: fix a typo in igb_reset_q_vector()
2015-04-21 23:20 [Patch net] igb: fix a typo in igb_reset_q_vector() Cong Wang
@ 2015-04-22 0:18 ` Jeff Kirsher
2015-04-22 0:26 ` Toshiaki Makita
1 sibling, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2015-04-22 0:18 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, Alexander Duyck
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
On Tue, 2015-04-21 at 16:20 -0700, Cong Wang wrote:
> Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a
> single function")
> Cc: Alexander Duyck <alexander.h.duyck@redhat.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks Cong, I will add your patch to my queue.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch net] igb: fix a typo in igb_reset_q_vector()
2015-04-21 23:20 [Patch net] igb: fix a typo in igb_reset_q_vector() Cong Wang
2015-04-22 0:18 ` Jeff Kirsher
@ 2015-04-22 0:26 ` Toshiaki Makita
2015-04-22 0:29 ` Jeff Kirsher
1 sibling, 1 reply; 6+ messages in thread
From: Toshiaki Makita @ 2015-04-22 0:26 UTC (permalink / raw)
To: Cong Wang, netdev; +Cc: Alexander Duyck, Jeff Kirsher
On 2015/04/22 8:20, Cong Wang wrote:
> Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a single function")
> Cc: Alexander Duyck <alexander.h.duyck@redhat.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index 8457d03..85bbeb2 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
> adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
>
> if (q_vector->rx.ring)
> - adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;
> + adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
>
> netif_napi_del(&q_vector->napi);
>
Hi Cong Wang,
I have already sent a patch to intel's tree.
http://git.kernel.org/cgit/linux/kernel/git/jkirsher/net-queue.git/commit/?h=dev-queue&id=02ac4b65689f8df824117395fd8d160c04161a7b
Toshiaki Makita
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch net] igb: fix a typo in igb_reset_q_vector()
2015-04-22 0:26 ` Toshiaki Makita
@ 2015-04-22 0:29 ` Jeff Kirsher
2015-04-22 4:35 ` Cong Wang
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Kirsher @ 2015-04-22 0:29 UTC (permalink / raw)
To: Toshiaki Makita; +Cc: Cong Wang, netdev, Alexander Duyck
[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]
On Wed, 2015-04-22 at 09:26 +0900, Toshiaki Makita wrote:
> On 2015/04/22 8:20, Cong Wang wrote:
> > Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a single function")
> > Cc: Alexander Duyck <alexander.h.duyck@redhat.com>
> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> > ---
> > drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> > index 8457d03..85bbeb2 100644
> > --- a/drivers/net/ethernet/intel/igb/igb_main.c
> > +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> > @@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
> > adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
> >
> > if (q_vector->rx.ring)
> > - adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;
> > + adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
> >
> > netif_napi_del(&q_vector->napi);
> >
>
> Hi Cong Wang,
>
> I have already sent a patch to intel's tree.
> http://git.kernel.org/cgit/linux/kernel/git/jkirsher/net-queue.git/commit/?h=dev-queue&id=02ac4b65689f8df824117395fd8d160c04161a7b
>
> Toshiaki Makita
>
Oops, yeah. I already have this in my queue. I wondered why the patch
seemed familiar, Cong dropping your patch since I already have
Tochiaki's patch in my queue.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch net] igb: fix a typo in igb_reset_q_vector()
2015-04-22 0:29 ` Jeff Kirsher
@ 2015-04-22 4:35 ` Cong Wang
2015-04-22 7:16 ` Jeff Kirsher
0 siblings, 1 reply; 6+ messages in thread
From: Cong Wang @ 2015-04-22 4:35 UTC (permalink / raw)
To: Jeff Kirsher
Cc: Toshiaki Makita, Linux Kernel Network Developers, Alexander Duyck
On Tue, Apr 21, 2015 at 5:29 PM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> On Wed, 2015-04-22 at 09:26 +0900, Toshiaki Makita wrote:
>> Hi Cong Wang,
>>
>> I have already sent a patch to intel's tree.
>> http://git.kernel.org/cgit/linux/kernel/git/jkirsher/net-queue.git/commit/?h=dev-queue&id=02ac4b65689f8df824117395fd8d160c04161a7b
>>
I didn't know this tree, I use -net tree.
>>
>
> Oops, yeah. I already have this in my queue. I wondered why the patch
> seemed familiar, Cong dropping your patch since I already have
> Tochiaki's patch in my queue.
Sure. Please queue it for -stable too, since it apparently fixes a bug.
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch net] igb: fix a typo in igb_reset_q_vector()
2015-04-22 4:35 ` Cong Wang
@ 2015-04-22 7:16 ` Jeff Kirsher
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2015-04-22 7:16 UTC (permalink / raw)
To: Cong Wang
Cc: Toshiaki Makita, Linux Kernel Network Developers, Alexander Duyck
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
On Tue, 2015-04-21 at 21:35 -0700, Cong Wang wrote:
> On Tue, Apr 21, 2015 at 5:29 PM, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > On Wed, 2015-04-22 at 09:26 +0900, Toshiaki Makita wrote:
> >> Hi Cong Wang,
> >>
> >> I have already sent a patch to intel's tree.
> >> http://git.kernel.org/cgit/linux/kernel/git/jkirsher/net-queue.git/commit/?h=dev-queue&id=02ac4b65689f8df824117395fd8d160c04161a7b
> >>
>
> I didn't know this tree, I use -net tree.
Guess that is why we have a MAINTAINERS file AND get_maintainer.pl
script. :-)
> >>
> >
> > Oops, yeah. I already have this in my queue. I wondered why the patch
> > seemed familiar, Cong dropping your patch since I already have
> > Tochiaki's patch in my queue.
>
> Sure. Please queue it for -stable too, since it apparently fixes a bug.
Will do.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-04-22 7:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-21 23:20 [Patch net] igb: fix a typo in igb_reset_q_vector() Cong Wang
2015-04-22 0:18 ` Jeff Kirsher
2015-04-22 0:26 ` Toshiaki Makita
2015-04-22 0:29 ` Jeff Kirsher
2015-04-22 4:35 ` Cong Wang
2015-04-22 7:16 ` Jeff Kirsher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).