From: Marek Lindner <lindner_marek@yahoo.de>
Date: Wed, 7 Dec 2011 10:02:50 +0000 (+0800)
Subject: batman-adv: warn if added interface is part of a bridge
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e242f9037f8a82ce2608c20a5460b670b2d5ff4;p=mv-sheeva.git

batman-adv: warn if added interface is part of a bridge

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index d3e0e32e51c..68b667c1d85 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -281,6 +281,14 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
 	if (!atomic_inc_not_zero(&hard_iface->refcount))
 		goto out;
 
+	/* hard-interface is part of a bridge */
+	if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT)
+		pr_err("You are about to enable batman-adv on '%s' which "
+		       "already is part of a bridge. Unless you know exactly "
+		       "what you are doing this is probably wrong and won't "
+		       "work the way you think it would.\n",
+		       hard_iface->net_dev->name);
+
 	soft_iface = dev_get_by_name(&init_net, iface_name);
 
 	if (!soft_iface) {