diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/core/dev_mcast.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/core/dev_mcast.c')
| -rw-r--r-- | net/core/dev_mcast.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c index f7fcb1f87..c52df0507 100644 --- a/net/core/dev_mcast.c +++ b/net/core/dev_mcast.c @@ -68,7 +68,7 @@ static rwlock_t dev_mc_lock = RW_LOCK_UNLOCKED; * Update the multicast list into the physical NIC controller. */ -void dev_mc_upload(struct device *dev) +void dev_mc_upload(struct net_device *dev) { /* Don't do anything till we up the interface [dev_open will call this function so the list will @@ -97,7 +97,7 @@ void dev_mc_upload(struct device *dev) * Delete a device level multicast */ -int dev_mc_delete(struct device *dev, void *addr, int alen, int glbl) +int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl) { int err = 0; struct dev_mc_list *dmi, **dmip; @@ -123,13 +123,14 @@ int dev_mc_delete(struct device *dev, void *addr, int alen, int glbl) */ *dmip = dmi->next; dev->mc_count--; + write_unlock_bh(&dev_mc_lock); + kfree_s(dmi,sizeof(*dmi)); + /* * We have altered the list, so the card * loaded filter is now wrong. Fix it */ - write_unlock_bh(&dev_mc_lock); - dev_mc_upload(dev); return 0; } @@ -144,15 +145,12 @@ done: * Add a device level multicast */ -int dev_mc_add(struct device *dev, void *addr, int alen, int glbl) +int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl) { int err = 0; struct dev_mc_list *dmi, *dmi1; - /* RED-PEN: does gfp_any() work now? It requires - true local_bh_disable rather than global. - */ - dmi1 = (struct dev_mc_list *)kmalloc(sizeof(*dmi), gfp_any()); + dmi1 = (struct dev_mc_list *)kmalloc(sizeof(*dmi), GFP_ATOMIC); write_lock_bh(&dev_mc_lock); for(dmi=dev->mc_list; dmi!=NULL; dmi=dmi->next) { @@ -194,7 +192,7 @@ done: * Discard multicast list when a device is downed */ -void dev_mc_discard(struct device *dev) +void dev_mc_discard(struct net_device *dev) { write_lock_bh(&dev_mc_lock); while (dev->mc_list!=NULL) { @@ -215,7 +213,7 @@ static int dev_mc_read_proc(char *buffer, char **start, off_t offset, off_t pos=0, begin=0; struct dev_mc_list *m; int len=0; - struct device *dev; + struct net_device *dev; read_lock(&dev_base_lock); for (dev = dev_base; dev; dev = dev->next) { @@ -257,7 +255,7 @@ done: } #endif -__initfunc(void dev_mcast_init(void)) +void __init dev_mcast_init(void) { #ifdef CONFIG_PROC_FS struct proc_dir_entry *ent; |