projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
net
/
core
/
dev_mcast.c
diff --git
a/net/core/dev_mcast.c
b/net/core/dev_mcast.c
index
cb530ee
..
05d6085
100644
(file)
--- 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) {