Commit 2c5e8933 authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv6: by default join ff01::1 and in case of forwarding ff01::2 and ff05:2 



Cc: Erik Hugne <erik.hugne@ericsson.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20314092

include/linux/in6.h

+9 −0
Original line number Diff line number Diff line
@@ -36,4 +36,13 @@ extern const struct in6_addr in6addr_linklocal_allnodes; 
extern const struct in6_addr in6addr_linklocal_allrouters;

#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \

		{ { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }

extern const struct in6_addr in6addr_interfacelocal_allnodes;

#define IN6ADDR_INTERFACELOCAL_ALLNODES_INIT \

		{ { { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }

extern const struct in6_addr in6addr_interfacelocal_allrouters;

#define IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT \

		{ { { 0xff,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }

extern const struct in6_addr in6addr_sitelocal_allrouters;

#define IN6ADDR_SITELOCAL_ALLROUTERS_INIT \

		{ { { 0xff,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }

#endif

net/ipv6/addrconf.c

+13 −2
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; 
const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;

const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;

const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;

const struct in6_addr in6addr_interfacelocal_allnodes = IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;

const struct in6_addr in6addr_interfacelocal_allrouters = IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;

const struct in6_addr in6addr_sitelocal_allrouters = IN6ADDR_SITELOCAL_ALLROUTERS_INIT;



/* Check if a valid qdisc is available */

static inline bool addrconf_qdisc_ok(const struct net_device *dev)
@@ -428,6 +431,9 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 
	/* protected by rtnl_lock */

	rcu_assign_pointer(dev->ip6_ptr, ndev);



	/* Join interface-local all-node multicast group */

	ipv6_dev_mc_inc(dev, &in6addr_interfacelocal_allnodes);



	/* Join all-node multicast group */

	ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes);
@@ -611,10 +617,15 @@ static void dev_forward_change(struct inet6_dev *idev) 
	if (idev->cnf.forwarding)

		dev_disable_lro(dev);

	if (dev->flags & IFF_MULTICAST) {

		if (idev->cnf.forwarding)

		if (idev->cnf.forwarding) {

			ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters);

		else

			ipv6_dev_mc_inc(dev, &in6addr_interfacelocal_allrouters);

			ipv6_dev_mc_inc(dev, &in6addr_sitelocal_allrouters);

		} else {

			ipv6_dev_mc_dec(dev, &in6addr_linklocal_allrouters);

			ipv6_dev_mc_dec(dev, &in6addr_interfacelocal_allrouters);

			ipv6_dev_mc_dec(dev, &in6addr_sitelocal_allrouters);

		}

	}



	list_for_each_entry(ifa, &idev->addr_list, if_list) {