From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932307AbbFLSvJ (ORCPT ); Fri, 12 Jun 2015 14:51:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42867 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755582AbbFLSvG (ORCPT ); Fri, 12 Jun 2015 14:51:06 -0400 From: Jarod Wilson To: linux-kernel@vger.kernel.org Cc: Jarod Wilson , Solarflare linux maintainers , netdev@vger.kernel.org Subject: [PATCH] ethernet/sfc: mark state UNINIT after unregister Date: Fri, 12 Jun 2015 14:51:01 -0400 Message-Id: <1434135061-42521-1-git-send-email-jarod@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without this change, modprobe -r sfc hits the BUG_ON() in efx_pci_remove_main(). Best as I can tell, this was just an oversight, efx->state gets set to STATE_UNINIT in the error path of efx_register_netdev() just after unregister_netdevice(), and the same should happen in efx_unregister_netdev() after its unregister_netdevice() call. Now I can load and unload no problem. CC: Solarflare linux maintainers CC: netdev@vger.kernel.org Signed-off-by: Jarod Wilson --- drivers/net/ethernet/sfc/efx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 0c42ed9..f3eaade 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -2448,6 +2448,7 @@ static void efx_unregister_netdev(struct efx_nic *efx) #endif device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type); unregister_netdev(efx->net_dev); + efx->state = STATE_UNINIT; } } -- 1.8.3.1