mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
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>
This commit is contained in:
parent
89794a6f3b
commit
13f18aa05f
16 changed files with 2 additions and 29 deletions
|
@ -160,11 +160,6 @@ static int can_create(struct net *net, struct socket *sock, int protocol)
|
|||
goto errout;
|
||||
}
|
||||
|
||||
if (cp->capability >= 0 && !capable(cp->capability)) {
|
||||
err = -EPERM;
|
||||
goto errout;
|
||||
}
|
||||
|
||||
sock->ops = cp->ops;
|
||||
|
||||
sk = sk_alloc(net, PF_CAN, GFP_KERNEL, cp->prot);
|
||||
|
|
|
@ -1576,7 +1576,6 @@ static struct proto bcm_proto __read_mostly = {
|
|||
static struct can_proto bcm_can_proto __read_mostly = {
|
||||
.type = SOCK_DGRAM,
|
||||
.protocol = CAN_BCM,
|
||||
.capability = -1,
|
||||
.ops = &bcm_ops,
|
||||
.prot = &bcm_proto,
|
||||
};
|
||||
|
|
|
@ -742,7 +742,6 @@ static struct proto raw_proto __read_mostly = {
|
|||
static struct can_proto raw_can_proto __read_mostly = {
|
||||
.type = SOCK_RAW,
|
||||
.protocol = CAN_RAW,
|
||||
.capability = -1,
|
||||
.ops = &raw_ops,
|
||||
.prot = &raw_proto,
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue