From 00137bbfacc95f0635f11c0f61c440599c3f213e Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 22 Jul 2008 14:21:58 -0700 Subject: [PATCH] --- yaml --- r: 104885 b: refs/heads/master c: 888c848ed34bd5f8cb56567624c0d951ab35174e h: refs/heads/master i: 104883: 825d0efb5a03a7137f41a441bf76a626aafc8011 v: v3 --- [refs] | 2 +- trunk/include/net/if_inet6.h | 2 -- trunk/net/ipv6/addrconf.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3bcbd8d6625f..c739fcf7da3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d6971e909e904be60218739fc961188471fc4f4 +refs/heads/master: 888c848ed34bd5f8cb56567624c0d951ab35174e diff --git a/trunk/include/net/if_inet6.h b/trunk/include/net/if_inet6.h index db66c7927743..c8effa4b1feb 100644 --- a/trunk/include/net/if_inet6.h +++ b/trunk/include/net/if_inet6.h @@ -193,8 +193,6 @@ struct inet6_dev struct rcu_head rcu; }; -extern struct ipv6_devconf ipv6_devconf; - static inline void ipv6_eth_mc_map(struct in6_addr *addr, char *buf) { /* diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 9f4fcce6379b..74d543d504a1 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -153,7 +153,7 @@ static int ipv6_chk_same_addr(struct net *net, const struct in6_addr *addr, static ATOMIC_NOTIFIER_HEAD(inet6addr_chain); -struct ipv6_devconf ipv6_devconf __read_mostly = { +static struct ipv6_devconf ipv6_devconf __read_mostly = { .forwarding = 0, .hop_limit = IPV6_DEFAULT_HOPLIMIT, .mtu6 = IPV6_MIN_MTU,