Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller
2012-04-10 14:30:45 -04:00
4047 changed files with 104278 additions and 50193 deletions

View File

@@ -60,7 +60,6 @@
#endif
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/mroute6.h>
MODULE_AUTHOR("Cast of dozens");

View File

@@ -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

View File

@@ -16,7 +16,6 @@
*
*/
#include <asm/system.h>
#include <asm/uaccess.h>
#include <linux/types.h>
#include <linux/sched.h>

View File

@@ -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;