From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60562 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbdALUsb (ORCPT ); Thu, 12 Jan 2017 15:48:31 -0500 Subject: Patch "net/mlx5e: Disable netdev after close" has been added to the 4.9-stable tree To: saeedm@mellanox.com, davem@davemloft.net, gregkh@linuxfoundation.org, mohamad@mellanox.com Cc: , From: Date: Thu, 12 Jan 2017 21:38:49 +0100 Message-ID: <148425352972187@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled net/mlx5e: Disable netdev after close to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-mlx5e-disable-netdev-after-close.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Jan 12 21:37:26 CET 2017 From: Saeed Mahameed Date: Wed, 28 Dec 2016 14:58:42 +0200 Subject: net/mlx5e: Disable netdev after close From: Saeed Mahameed [ Upstream commit 37f304d10030bb425c19099e7b955d9c3ec4cba3 ] Disable netdev should come after it was closed, although no harm of doing it before -hence the MLX5E_STATE_DESTROYING bit- but it is more natural this way. Fixes: 26e59d8077a3 ("net/mlx5e: Implement mlx5e interface attach/detach callbacks") Signed-off-by: Saeed Mahameed Reviewed-by: Mohamad Haj Yahia Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3942,10 +3942,6 @@ void mlx5e_detach_netdev(struct mlx5_cor const struct mlx5e_profile *profile = priv->profile; set_bit(MLX5E_STATE_DESTROYING, &priv->state); - if (profile->disable) - profile->disable(priv); - - flush_workqueue(priv->wq); rtnl_lock(); if (netif_running(netdev)) @@ -3953,6 +3949,10 @@ void mlx5e_detach_netdev(struct mlx5_cor netif_device_detach(netdev); rtnl_unlock(); + if (profile->disable) + profile->disable(priv); + flush_workqueue(priv->wq); + mlx5e_destroy_q_counter(priv); profile->cleanup_rx(priv); mlx5e_close_drop_rq(priv); Patches currently in stable-queue which might be from saeedm@mellanox.com are queue-4.9/net-mlx5e-don-t-sync-netdev-state-when-not-registered.patch queue-4.9/net-mlx5-mask-destination-mac-value-in-ethtool-steering-rules.patch queue-4.9/net-mlx5-check-fw-limitations-on-log_max_qp-before-setting-it.patch queue-4.9/net-mlx5-avoid-shadowing-numa_node.patch queue-4.9/net-mlx5e-disable-netdev-after-close.patch queue-4.9/net-mlx5e-remove-warn_once-from-adaptive-moderation-code.patch queue-4.9/net-mlx5-prevent-setting-multicast-macs-for-vfs.patch queue-4.9/net-mlx5-cancel-recovery-work-in-remove-flow.patch