git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
bridge
/
br.c
diff --git
a/net/bridge/br.c
b/net/bridge/br.c
index
12da21a
..
188cc1a
100644
(file)
--- a/
net/bridge/br.c
+++ b/
net/bridge/br.c
@@
-19,23
+19,13
@@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
-#include <linux/llc.h>
-#include <net/llc.h>
#include "br_private.h"
int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
#include "br_private.h"
int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
-static struct llc_sap *br_stp_sap;
-
static int __init br_init(void)
{
static int __init br_init(void)
{
- br_stp_sap = llc_sap_open(LLC_SAP_BSPAN, br_stp_rcv);
- if (!br_stp_sap) {
- printk(KERN_ERR "bridge: can't register sap for STP\n");
- return -EBUSY;
- }
-
br_fdb_init();
#ifdef CONFIG_BRIDGE_NETFILTER
br_fdb_init();
#ifdef CONFIG_BRIDGE_NETFILTER
@@
-55,8
+45,6
@@
static int __init br_init(void)
static void __exit br_deinit(void)
{
static void __exit br_deinit(void)
{
- rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
-
#ifdef CONFIG_BRIDGE_NETFILTER
br_netfilter_fini();
#endif
#ifdef CONFIG_BRIDGE_NETFILTER
br_netfilter_fini();
#endif
@@
-67,7
+55,6
@@
static void __exit br_deinit(void)
synchronize_net();
synchronize_net();
- llc_sap_put(br_stp_sap);
br_fdb_get_hook = NULL;
br_fdb_put_hook = NULL;
br_fdb_get_hook = NULL;
br_fdb_put_hook = NULL;