diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 17:06:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 17:06:47 -0800 |
| commit | 45ed344cc7b6456856b4ae5e3d81cdb18b98f8ad (patch) | |
| tree | ba64db58e1d4d1fb67b3b666279ebb8e4f7fb42a /net/core/dev_mcast.c | |
| parent | 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (diff) | |
| parent | bb7e8c5a55c1f5d4192f4b61a84a791796ebf0c3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dev_mcast.c')
| -rw-r--r-- | net/core/dev_mcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c index cb530eef0e3..05d60850840 100644 --- a/net/core/dev_mcast.c +++ b/net/core/dev_mcast.c @@ -158,7 +158,7 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl) int err = 0; struct dev_mc_list *dmi, *dmi1; - dmi1 = (struct dev_mc_list *)kmalloc(sizeof(*dmi), GFP_ATOMIC); + dmi1 = kmalloc(sizeof(*dmi), GFP_ATOMIC); spin_lock_bh(&dev->xmit_lock); for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) { |