From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932449AbbJ2NXY (ORCPT ); Thu, 29 Oct 2015 09:23:24 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38147 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757028AbbJ2NXV (ORCPT ); Thu, 29 Oct 2015 09:23:21 -0400 From: Neil Armstrong Subject: [PATCH v2 3/6] net: dsa: cleanup resources upon module removal To: "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Guenter Roeck , vivien.didelot@savoirfairelinux.com, Fabian Frederick , Pavel Nakonechny , Joe Perches , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frode Isaksen Organization: Baylibre Message-ID: <56321DC0.7010805@baylibre.com> Date: Thu, 29 Oct 2015 14:23:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure that we unassign the master_netdev dsa_ptr to make the packet processing go through the regulard Ethernet receive path. Suggested-by: Florian Fainelli Signed-off-by: Neil Armstrong --- net/dsa/dsa.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 19cff8f..b2f696c 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -949,6 +949,14 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) flush_delayed_work(&dst->link_poll_work); } + dst->master_netdev->dsa_ptr = NULL; + + /* If we used a tagging format that doesn't have an ethertype + * field, make sure that all packets from this point get sent + * without the tag and go through the regular receive path. + */ + wmb(); + for (i = 0; i < dst->pd->nr_chips; i++) { struct dsa_switch *ds = dst->ds[i]; -- 1.9.1