can: rework skb reserved data handling

[mirror_ubuntu-bionic-kernel.git] / net / can / bcm.c

diff --git a/net/can/bcm.c b/net/can/bcm.c
index ccc27b9e8384f710777d2f207d18817a39bb01f2..28e12d18f0f147b592ee5e4975f4cecf3c5b7c2f 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -261,8 +261,8 @@ static void bcm_can_tx(struct bcm_op *op)
        if (!skb)
                goto out;
 
-       skb_reserve(skb, sizeof(struct can_skb_priv));
-       ((struct can_skb_priv *)(skb->head))->ifindex = dev->ifindex;
+       can_skb_reserve(skb);
+       can_skb_prv(skb)->ifindex = dev->ifindex;
 
        memcpy(skb_put(skb, CFSIZ), cf, CFSIZ);
 
@@ -1207,7 +1207,7 @@ static int bcm_tx_send(struct msghdr *msg, int ifindex, struct sock *sk)
        if (!skb)
                return -ENOMEM;
 
-       skb_reserve(skb, sizeof(struct can_skb_priv));
+       can_skb_reserve(skb);
 
        err = memcpy_fromiovec(skb_put(skb, CFSIZ), msg->msg_iov, CFSIZ);
        if (err < 0) {
@@ -1221,7 +1221,7 @@ static int bcm_tx_send(struct msghdr *msg, int ifindex, struct sock *sk)
                return -ENODEV;
        }
 
-       ((struct can_skb_priv *)(skb->head))->ifindex = dev->ifindex;
+       can_skb_prv(skb)->ifindex = dev->ifindex;
        skb->dev = dev;
        skb->sk  = sk;
        err = can_send(skb, 1); /* send with loopback */