From patchwork Sat Jun 13 04:09:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483811 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CC82140285 for ; Sat, 13 Jun 2015 14:08:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=w3EVUx0t; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751005AbbFMEHx (ORCPT ); Sat, 13 Jun 2015 00:07:53 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:38263 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765AbbFMEHv (ORCPT ); Sat, 13 Jun 2015 00:07:51 -0400 Received: by igblz2 with SMTP id lz2so21690237igb.1 for ; Fri, 12 Jun 2015 21:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2Ejkd2kEe1nN9MCeYLhyNhBsV8sQTHUDzWcxPbFCjC4=; b=w3EVUx0tUYACe8ZsJW27Q49OS47R7KFgD36R5iFTM3i4NcXHeRDV+CBQW1fEBgDIwP BMXJ+murEKbhfVrKyj979Pcl1Vbc7GBxZhbgcEjBvQRLhUhy6UpgkjoWwsTYSO1+hmRd 5EyB5d1PpXuLyfbi3BvHq0S/wJKgsUa4V6JR3b59yrR/+JEZbQZcWllgDOEX+V7i7jAx We3y2vTRplLbGE6SF85W18BRgqDrk+eJmb36ctmtwe+r6g3HYz1tN4EunaRPVhyiOct4 FNzUYlTtoUNgGeO2flWtteFP1pmMlbRQUVEAHSpBXMFF2UzsjKtim4bOyPMQiobhzHLH 6cZQ== X-Received: by 10.50.132.33 with SMTP id or1mr8425805igb.31.1434168470316; Fri, 12 Jun 2015 21:07:50 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id 196sm3913473ioe.23.2015.06.12.21.07.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 21:07:49 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us Subject: [PATCH net-next] rocker: gaurd against NULL rocker_port when removing ports Date: Fri, 12 Jun 2015 21:09:44 -0700 Message-Id: <1434168584-61990-1-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman The ports array is filled in as ports are probed, but if probing doesn't finish, we need to stop only those ports that where probed successfully. Check the ports array for NULL to skip un-probed ports when stopping. Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- drivers/net/ethernet/rocker/rocker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index 819289e..c6a6e3c 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -4802,6 +4802,8 @@ static void rocker_remove_ports(const struct rocker *rocker) for (i = 0; i < rocker->port_count; i++) { rocker_port = rocker->ports[i]; + if (!rocker_port) + continue; rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE, ROCKER_OP_FLAG_REMOVE); unregister_netdev(rocker_port->dev);