diff options
| author | Eric Paris <eparis@redhat.com> | 2009-11-05 23:44:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 00:40:17 -0500 |
| commit | 13f18aa05f5abe135f47b6417537ae2b2fedc18c (patch) | |
| tree | 3bcf8c52bd9d957fd09a87224c9d44566071f981 /net/can/af_can.c | |
| parent | 89794a6f3bf6db552b1ff4d2ad42fdd8739ac2a2 (diff) | |
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/can/af_can.c')
| -rw-r--r-- | net/can/af_can.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 3f2eb27e1ffb..9c0426dc3184 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
| @@ -160,11 +160,6 @@ static int can_create(struct net *net, struct socket *sock, int protocol) | |||
| 160 | goto errout; | 160 | goto errout; |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | if (cp->capability >= 0 && !capable(cp->capability)) { | ||
| 164 | err = -EPERM; | ||
| 165 | goto errout; | ||
| 166 | } | ||
| 167 | |||
| 168 | sock->ops = cp->ops; | 163 | sock->ops = cp->ops; |
| 169 | 164 | ||
| 170 | sk = sk_alloc(net, PF_CAN, GFP_KERNEL, cp->prot); | 165 | sk = sk_alloc(net, PF_CAN, GFP_KERNEL, cp->prot); |
