netdev - [RFC PATCH 24/24] net: rbridge: replace net_port rx

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 24 Sep 2014 17:52:20 +0200
From:	Ahmed Amamou <ahmed@...di.net>
To:	netdev@...r.kernel.org
Cc:	william@...di.net, f.cachereul@...halink.fr,
	Ahmed Amamou <ahmed@...di.net>,
	Kamel Haddadou <kamel@...di.net>
Subject: [RFC PATCH 24/24] net: rbridge: replace net_port rx_handler

replace classic rx_handler in bridge by the new rbr_handle_frame in
order to provide trill support

Signed-off-by: Ahmed Amamou <ahmed@...di.net>
Signed-off-by: Kamel Haddadou <kamel@...di.net>
Signed-off-by: William Dauchy <william@...di.net>
---
 net/bridge/br_if.c      | 4 ++++
 net/bridge/br_private.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 078d336..7e6c6a0 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -480,7 +480,11 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	if (err)
 		goto err4;
 
+#ifdef CONFIG_TRILL
+	err = netdev_rx_handler_register(dev, rbr_handle_frame, p);
+#else
 	err = netdev_rx_handler_register(dev, br_handle_frame, p);
+#endif
 	if (err)
 		goto err5;
 
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 152545e..31bccf8 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -876,4 +876,8 @@ static inline int br_sysfs_addbr(struct net_device *dev) { return 0; }
 static inline void br_sysfs_delbr(struct net_device *dev) { return; }
 #endif /* CONFIG_SYSFS */
 
+#ifdef CONFIG_TRILL
+/* rbridge/rbr.c */
+extern rx_handler_result_t rbr_handle_frame(struct sk_buff **pskb);
+#endif /* CONFIG_TRILL */
 #endif
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html