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.du...@redhat.com>
> > Cc: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
> > Signed-off-by: Cong Wang <xiyou.wangc...@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.
signature.asc
Description: This is a digitally signed message part
