From patchwork Mon Apr 13 09:15:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Toshiaki Makita X-Patchwork-Id: 460941 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C8024140281 for ; Tue, 14 Apr 2015 06:56:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 225328D764; Mon, 13 Apr 2015 20:56:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yhnH3CN1kEFp; Mon, 13 Apr 2015 20:56:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 36E648C902; Mon, 13 Apr 2015 20:56:49 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 775E41C1FC8 for ; Mon, 13 Apr 2015 09:28:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73AFA8B932 for ; Mon, 13 Apr 2015 09:28:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IYVd2f2xcKw9 for ; Mon, 13 Apr 2015 09:28:26 +0000 (UTC) X-Greylist: delayed 00:12:51 by SQLgrey-1.7.6 Received: from tama50.ecl.ntt.co.jp (tama50.ecl.ntt.co.jp [129.60.39.147]) by whitealder.osuosl.org (Postfix) with ESMTP id 67F948B930 for ; Mon, 13 Apr 2015 09:28:24 +0000 (UTC) Received: from vc2.ecl.ntt.co.jp (vc2.ecl.ntt.co.jp [129.60.86.154]) by tama50.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id t3D9FS1u012926; Mon, 13 Apr 2015 18:15:28 +0900 Received: from vc2.ecl.ntt.co.jp (localhost [127.0.0.1]) by vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 6E04B5F612; Mon, 13 Apr 2015 18:15:28 +0900 (JST) Received: from imail3.m.ecl.ntt.co.jp (imail3.m.ecl.ntt.co.jp [129.60.5.248]) by vc2.ecl.ntt.co.jp (Postfix) with ESMTP id 535165F594; Mon, 13 Apr 2015 18:15:28 +0900 (JST) Received: from ubuntu-vm-makita ([129.60.241.251]) by imail3.m.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id t3D9FLZe026273; Mon, 13 Apr 2015 18:15:28 +0900 Received: by ubuntu-vm-makita (Postfix, from userid 1000) id A353E1E6427; Mon, 13 Apr 2015 18:15:18 +0900 (JST) From: Toshiaki Makita To: Jeff Kirsher Date: Mon, 13 Apr 2015 18:15:11 +0900 Message-Id: <1428916512-25559-2-git-send-email-makita.toshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1428916512-25559-1-git-send-email-makita.toshiaki@lab.ntt.co.jp> References: <1428916512-25559-1-git-send-email-makita.toshiaki@lab.ntt.co.jp> X-TM-AS-MML: disable X-Mailman-Approved-At: Mon, 13 Apr 2015 20:56:46 +0000 Cc: intel-wired-lan@lists.osuosl.org, Toshiaki Makita Subject: [Intel-wired-lan] [PATCH net 2/2] igb: Fix NULL assignment to incorrect variable in igb_reset_q_vector X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" adapter->tx_ring is set to NULL where rx_ring should be. Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a single function") Signed-off-by: Toshiaki Makita Tested-by: Aaron Brown --- 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 010ddcb..b664512 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);