summaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorEric Paris2009-11-06 05:44:37 +0100
committerDavid S. Miller2009-11-06 06:40:17 +0100
commit13f18aa05f5abe135f47b6417537ae2b2fedc18c (patch)
tree3bcf8c52bd9d957fd09a87224c9d44566071f981 /net/ipv6/af_inet6.c
parentbnx2x: version 1.52.1-3 (diff)
downloadkernel-qcow2-linux-13f18aa05f5abe135f47b6417537ae2b2fedc18c.tar.gz
kernel-qcow2-linux-13f18aa05f5abe135f47b6417537ae2b2fedc18c.tar.xz
kernel-qcow2-linux-13f18aa05f5abe135f47b6417537ae2b2fedc18c.zip
net: drop capability from protocol definitions
struct can_proto had a capability field which wasn't ever used. It is dropped entirely. struct inet_protosw had a capability field which can be more clearly expressed in the code by just checking if sock->type = SOCK_RAW. Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 9105b25defe5..1b3889356599 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -158,7 +158,7 @@ lookup_protocol:
}
err = -EPERM;
- if (answer->capability > 0 && !capable(answer->capability))
+ if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW))
goto out_rcu_unlock;
sock->ops = answer->ops;