diff options
| author | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /net/ipv6/anycast.c | |
| parent | ftrace: only trace preempt off with preempt tracer (diff) | |
| parent | Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
| download | kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz kernel-qcow2-linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'net/ipv6/anycast.c')
| -rw-r--r-- | net/ipv6/anycast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c index 4e1b29fabdf0..8336cd81cb4f 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c @@ -60,7 +60,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr) struct inet6_dev *idev; struct ipv6_ac_socklist *pac; struct net *net = sock_net(sk); - int ishost = !ipv6_devconf.forwarding; + int ishost = !net->ipv6.devconf_all->forwarding; int err = 0; if (!capable(CAP_NET_ADMIN)) |