Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -60,7 +60,6 @@
|
||||
#endif
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
#include <linux/mroute6.h>
|
||||
|
||||
MODULE_AUTHOR("Cast of dozens");
|
||||
|
@@ -66,7 +66,6 @@
|
||||
#include <net/inet_common.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
/*
|
||||
* The ICMP socket(s). This is the most convenient way to flow control
|
||||
|
@@ -16,7 +16,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/sched.h>
|
||||
|
@@ -2044,7 +2044,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
|
||||
if (!delta)
|
||||
pmc->mca_sfcount[sfmode]--;
|
||||
for (j=0; j<i; j++)
|
||||
(void) ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
|
||||
ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
|
||||
} else if (isexclude != (pmc->mca_sfcount[MCAST_EXCLUDE] != 0)) {
|
||||
struct ip6_sf_list *psf;
|
||||
|
||||
|
Reference in New Issue
Block a user