Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d28ab1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-next-2.6-v6ready-20080703' of... 

Merge branch 'net-next-2.6-v6ready-20080703' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
parents 40b215e5 e0835f8f

Documentation/networking/ip-sysctl.txt

+11 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,17 @@ max_addresses - INTEGER 
	autoconfigured addresses.

	Default: 16



disable_ipv6 - BOOLEAN

	Disable IPv6 operation.

	Default: FALSE (enable IPv6 operation)



accept_dad - INTEGER

	Whether to accept DAD (Duplicate Address Detection).

	0: Disable DAD

	1: Enable DAD (default)

	2: Enable DAD, and disable IPv6 operation if MAC-based duplicate

	   link-local address has been found.



icmp/*:

ratelimit - INTEGER

	Limit the maximal rates for sending ICMPv6 packets.

include/linux/igmp.h

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, 
extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,

		struct group_filter __user *optval, int __user *optlen);

extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif);

extern void ip_mr_init(void);

extern void ip_mc_init_dev(struct in_device *);

extern void ip_mc_destroy_dev(struct in_device *);

extern void ip_mc_up(struct in_device *);

include/linux/ipv6.h

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ struct ipv6_devconf { 
#ifdef CONFIG_IPV6_MROUTE

	__s32		mc_forwarding;

#endif

	__s32		disable_ipv6;

	__s32		accept_dad;

	void		*sysctl;

};
@@ -194,6 +196,8 @@ enum { 
	DEVCONF_OPTIMISTIC_DAD,

	DEVCONF_ACCEPT_SOURCE_ROUTE,

	DEVCONF_MC_FORWARDING,

	DEVCONF_DISABLE_IPV6,

	DEVCONF_ACCEPT_DAD,

	DEVCONF_MAX

};

include/linux/mroute.h

+27 −1
Original line number Diff line number Diff line
@@ -144,11 +144,37 @@ static inline int ip_mroute_opt(int opt) 
}

#endif



#ifdef CONFIG_IP_MROUTE

extern int ip_mroute_setsockopt(struct sock *, int, char __user *, int);

extern int ip_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

extern int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg);

extern void ip_mr_init(void);

extern int ip_mr_init(void);

#else

static inline

int ip_mroute_setsockopt(struct sock *sock,

			 int optname, char __user *optval, int optlen)

{

	return -ENOPROTOOPT;

}



static inline

int ip_mroute_getsockopt(struct sock *sock,

			 int optname, char __user *optval, int __user *optlen)

{

	return -ENOPROTOOPT;

}



static inline

int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)

{

	return -ENOIOCTLCMD;

}



static inline int ip_mr_init(void)

{

	return 0;

}

#endif



struct vif_device

{

include/linux/mroute6.h

+34 −1
Original line number Diff line number Diff line
@@ -131,11 +131,44 @@ static inline int ip6_mroute_opt(int opt) 


struct sock;



#ifdef CONFIG_IPV6_MROUTE

extern int ip6_mroute_setsockopt(struct sock *, int, char __user *, int);

extern int ip6_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

extern int ip6_mr_input(struct sk_buff *skb);

extern int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg);

extern void ip6_mr_init(void);

extern int ip6_mr_init(void);

extern void ip6_mr_cleanup(void);

#else

static inline

int ip6_mroute_setsockopt(struct sock *sock,

			  int optname, char __user *optval, int optlen)

{

	return -ENOPROTOOPT;

}



static inline

int ip6_mroute_getsockopt(struct sock *sock,

			  int optname, char __user *optval, int __user *optlen)

{

	return -ENOPROTOOPT;

}



static inline

int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)

{

	return -ENOIOCTLCMD;

}



static inline int ip6_mr_init(void)

{

	return 0;

}



static inline void ip6_mr_cleanup(void)

{

	return;

}

#endif



struct mif_device

{