From patchwork Wed Jun 16 22:39:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 210 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id A32D81542A7 for ; Thu, 17 Jun 2010 00:39:25 +0200 (CEST) Received: (qmail invoked by alias); 16 Jun 2010 22:39:24 -0000 Received: from i59F6BE66.versanet.de (EHLO sven-desktop.lazhur.ath.cx) [89.246.190.102] by mail.gmx.net (mp049) with SMTP; 17 Jun 2010 00:39:24 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/Co7JpKyDCYzOfUmSws/M4zF3dP7g5droOPGglHm LhiBkCwkrhIrok From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.net Date: Thu, 17 Jun 2010 00:39:21 +0200 Message-Id: <1276727961-18719-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: use rx_handler_data pointer to store net_bridge_port pointer X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2010 22:39:25 -0000 From: Jiri Pirko Register net_bridge_port pointer as rx_handler data pointer. As br_port is removed from struct net_device, another netdev priv_flag is added to indicate the device serves as a bridge port. Also rcuized pointers are now correctly dereferenced in br_fdb.c and in netfilter parts. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Sven Eckelmann --- batman-adv-kernelland/hard-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/hard-interface.c b/batman-adv-kernelland/hard-interface.c index 70fd314..0773420 100644 --- a/batman-adv-kernelland/hard-interface.c +++ b/batman-adv-kernelland/hard-interface.c @@ -74,7 +74,7 @@ static int is_valid_iface(struct net_device *net_dev) #endif /* Device is being bridged */ - /* if (net_dev->br_port != NULL) + /* if (net_dev->priv_flags & IFF_BRIDGE_PORT) return 0; */ return 1;