projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[linux-drm-fsl-dcu.git]
/
net
/
802
/
garp.c
diff --git
a/net/802/garp.c
b/net/802/garp.c
index 9ed7c0e7dc1759972f6c323085a0f10f1d38d31d..941f2a324d3aed7ef68bb2173eb3f562d49a104a 100644
(file)
--- a/
net/802/garp.c
+++ b/
net/802/garp.c
@@
-576,7
+576,7
@@
int garp_init_applicant(struct net_device *dev, struct garp_application *appl)
if (!app)
goto err2;
if (!app)
goto err2;
- err = dev_mc_add(dev, appl->proto.group_address
, ETH_ALEN, 0
);
+ err = dev_mc_add(dev, appl->proto.group_address);
if (err < 0)
goto err3;
if (err < 0)
goto err3;
@@
-616,7
+616,7
@@
void garp_uninit_applicant(struct net_device *dev, struct garp_application *appl
garp_pdu_queue(app);
garp_queue_xmit(app);
garp_pdu_queue(app);
garp_queue_xmit(app);
- dev_mc_del
ete(dev, appl->proto.group_address, ETH_ALEN, 0
);
+ dev_mc_del
(dev, appl->proto.group_address
);
kfree(app);
garp_release_port(dev);
}
kfree(app);
garp_release_port(dev);
}