diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
| commit | 825423e4c4f18289df2393951cfd2a7a31fc0464 (patch) | |
| tree | 4ad80e981c3d9effa910d2247d118d254f9a5d09 /net/atm | |
| parent | c4693dc4856ab907a5c02187a8d398861bebfc7e (diff) | |
Merge with Linux 2.4.1.
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/lec.c | 10 | ||||
| -rw-r--r-- | net/atm/lec.h | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 51be9f077..ec0dc2671 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -51,6 +51,11 @@ static unsigned char bridge_ula_lec[] = {0x01, 0x80, 0xc2, 0x00, 0x00}; #define DPRINTK(format,args...) #endif +struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br, + unsigned char *addr); +void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); + + #define DUMP_PACKETS 0 /* 0 = None, * 1 = 30 first bytes * 2 = Whole packet @@ -853,8 +858,11 @@ static void __exit lane_module_cleanup(void) if (dev_lec[i] != NULL) { priv = (struct lec_priv *)dev_lec[i]->priv; #if defined(CONFIG_TR) - unregister_trdev(dev_lec[i]); + if (priv->is_trdev) + unregister_trdev(dev_lec[i]); + else #endif + unregister_netdev(dev_lec[i]); kfree(dev_lec[i]); dev_lec[i] = NULL; } diff --git a/net/atm/lec.h b/net/atm/lec.h index f40a37fa3..5dd0494e9 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -16,9 +16,9 @@ #if defined (CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #include <linux/if_bridge.h> -struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br, +extern struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br, unsigned char *addr); -void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); +extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ #define LEC_HEADER_LEN 16 |