aboutsummaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
Diffstat (limited to 'net/can')
-rw-r--r--net/can/af_can.c5
-rw-r--r--net/can/bcm.c1
-rw-r--r--net/can/raw.c1
3 files changed, 0 insertions, 7 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);
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 2f47039c79dd..67b5433db13b 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1576,7 +1576,6 @@ static struct proto bcm_proto __read_mostly = {
1576static struct can_proto bcm_can_proto __read_mostly = { 1576static struct can_proto bcm_can_proto __read_mostly = {
1577 .type = SOCK_DGRAM, 1577 .type = SOCK_DGRAM,
1578 .protocol = CAN_BCM, 1578 .protocol = CAN_BCM,
1579 .capability = -1,
1580 .ops = &bcm_ops, 1579 .ops = &bcm_ops,
1581 .prot = &bcm_proto, 1580 .prot = &bcm_proto,
1582}; 1581};
diff --git a/net/can/raw.c b/net/can/raw.c
index 6e77db58b9e6..abca920440b5 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -742,7 +742,6 @@ static struct proto raw_proto __read_mostly = {
742static struct can_proto raw_can_proto __read_mostly = { 742static struct can_proto raw_can_proto __read_mostly = {
743 .type = SOCK_RAW, 743 .type = SOCK_RAW,
744 .protocol = CAN_RAW, 744 .protocol = CAN_RAW,
745 .capability = -1,
746 .ops = &raw_ops, 745 .ops = &raw_ops,
747 .prot = &raw_proto, 746 .prot = &raw_proto,
748}; 747};