aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-09-11 14:50:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-11 15:54:26 -0400
commit4fb019a01a7f67342d4a88d26c0817afe392c669 (patch)
tree6fe31bb55ee8efff2a7774c214e90ba732695386 /net
parentffcfb8db540ff879c2a85bf7e404954281443414 (diff)
net: force bridge module(s) to be GPL
The only valid usage for the bridge frame hooks are by a GPL components (such as the bridge module). The kernel should not leave a crack in the door for proprietary networking stacks to slip in. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 1a6561b1eb90..f843a0c5ecf9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2116,7 +2116,7 @@ static inline int deliver_skb(struct sk_buff *skb,
2116/* This hook is defined here for ATM LANE */ 2116/* This hook is defined here for ATM LANE */
2117int (*br_fdb_test_addr_hook)(struct net_device *dev, 2117int (*br_fdb_test_addr_hook)(struct net_device *dev,
2118 unsigned char *addr) __read_mostly; 2118 unsigned char *addr) __read_mostly;
2119EXPORT_SYMBOL(br_fdb_test_addr_hook); 2119EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);
2120#endif 2120#endif
2121 2121
2122/* 2122/*
@@ -2125,7 +2125,7 @@ EXPORT_SYMBOL(br_fdb_test_addr_hook);
2125 */ 2125 */
2126struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p, 2126struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,
2127 struct sk_buff *skb) __read_mostly; 2127 struct sk_buff *skb) __read_mostly;
2128EXPORT_SYMBOL(br_handle_frame_hook); 2128EXPORT_SYMBOL_GPL(br_handle_frame_hook);
2129 2129
2130static inline struct sk_buff *handle_bridge(struct sk_buff *skb, 2130static inline struct sk_buff *handle_bridge(struct sk_buff *skb,
2131 struct packet_type **pt_prev, int *ret, 2131 struct packet_type **pt_prev, int *ret,