diff options
| author |   YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2006-03-20 16:51:48 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-03-20 16:51:48 -0800 |
| commit | 74a3a0ed9096ba9feffc7e44f2a2c37d968bc6d1 (patch) | |
| tree | 932bfb5e207cb91a1a87f45c26010dd9f7d804fb | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-74a3a0ed9096ba9feffc7e44f2a2c37d968bc6d1.tar.xz linux-dev-74a3a0ed9096ba9feffc7e44f2a2c37d968bc6d1.zip | |
[IPV6]: TUNNEL6: Don't try to add multicast route twice.
Since addrconf_add_dev() has already called addrconf_add_mroute()
to added route for multicast prefix, there's no point to call it
again in addrconf_ip6_tnl_config().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/addrconf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 19727d941962..441eeacfc851 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2143,7 +2143,6 @@ static void addrconf_ip6_tnl_config(struct net_device *dev) return; } ip6_tnl_add_linklocal(idev); - addrconf_add_mroute(dev); } static int addrconf_notify(struct notifier_block *this, unsigned long event, |