From patchwork Fri May 3 02:33:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2514851 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id ED62ADF215 for ; Fri, 3 May 2013 02:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762287Ab3ECCgX (ORCPT ); Thu, 2 May 2013 22:36:23 -0400 Received: from mail-da0-f44.google.com ([209.85.210.44]:47567 "EHLO mail-da0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753873Ab3ECCgX (ORCPT ); Thu, 2 May 2013 22:36:23 -0400 Received: by mail-da0-f44.google.com with SMTP id z8so587459daj.31 for ; Thu, 02 May 2013 19:36:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=yzjyuov4RdePczdZPEZcazVkUnE+hl67xONysIpQktc=; b=GV3EnAKy0p5wpaXYXppNYieMMWrEltTdLZ4rVWRhY8jNenkoio47lmJVn29wkJnFJj GaDmIbGphNJLosGt5NWNPHR4NZlRQRwUi9V+QQRoZGw/Dv0MeI+lKyS/bSBUBb0BWusO sBAGV4kH9p+Uf3F2+vrMU7u8VG4Giz7V4pRqGmX1JRErd3Ng2Zx2QuB84klSVVT/VFjj tBgnBK3d56fjWSZ/D2PrPyUnwPxE+oPrRT/F98qBv5GCx61XwAO0bjHFz8MOd4GL2bOB IXG6qCOM7mOaX39EHhUmGsKwFlSCmBbS0hrrlE/Ms0BFInAhpFt7mMw5KlorUEesG8MD B0jw== X-Received: by 10.68.7.39 with SMTP id g7mr11613793pba.146.1367548582553; Thu, 02 May 2013 19:36:22 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id az5sm7391484pbc.18.2013.05.02.19.36.20 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 19:36:21 -0700 (PDT) From: Thomas Pedersen To: Johannes Berg Cc: linux-wirelss , me@bobcopeland.com, open80211s , Thomas Pedersen Subject: [RFC 06/12] mac80211: notify bridge when leaving mesh Date: Thu, 2 May 2013 19:33:56 -0700 Message-Id: <1367548442-8229-7-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367548442-8229-1-git-send-email-thomas@cozybit.com> References: <1367548442-8229-1-git-send-email-thomas@cozybit.com> X-Gm-Message-State: ALoCoQmLgv0//MvuvXckK7fOEc/Ax6YQBUQe3WIuoyqpcYtU0+19yKDPJCWoIBOs0V5FviuADJgU Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org After turning carrier off, any parent bridge interface needs to be notified. Otherwise we would see a panic when attempting to transmit frames on a mesh interface which hadn't yet been put down. Signed-off-by: Thomas Pedersen --- net/mac80211/mesh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index eac9988..271ddc9 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -993,6 +993,9 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) struct beacon_data *bcn; netif_carrier_off(sdata->dev); + if (sdata->dev->priv_flags & IFF_BRIDGE_PORT) + /* stop bridge transmissions */ + call_netdevice_notifiers(NETDEV_CHANGE, sdata->dev); /* stop the beacon */ ifmsh->mesh_id_len = 0;