6 files changed, 21 insertions, 13 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 59ada082a994..f9cba4123c66 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -512,8 +512,8 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)
         skb->pkt_type = PACKET_BROADCAST;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-        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;
 
         *cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
         memset(*cf, 0, sizeof(struct can_frame));
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index e79a8d10e0fc..06b7e097d36e 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -195,8 +195,8 @@ static void slc_bump(struct slcan *sl)
         skb->pkt_type = PACKET_BROADCAST;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-        skb_reserve(skb, sizeof(struct can_skb_priv));
-        ((struct can_skb_priv *)(skb->head))->ifindex = sl->dev->ifindex;
+        can_skb_reserve(skb);
+        can_skb_prv(skb)->ifindex = sl->dev->ifindex;
 
         memcpy(skb_put(skb, sizeof(struct can_frame)),
                &cf, sizeof(struct can_frame));
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index 4b0f24d3a878..2f0543f7510c 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -32,4 +32,14 @@ struct can_skb_priv {
         struct can_frame cf[0];
 };
 
+static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb)
+{
+        return (struct can_skb_priv *)(skb->head);
+}
+
+static inline void can_skb_reserve(struct sk_buff *skb)
+{
+        skb_reserve(skb, sizeof(struct can_skb_priv));
+}
+
 #endif /* CAN_SKB_H */
diff --git a/net/can/bcm.c b/net/can/bcm.c
index ccc27b9e8384..28e12d18f0f1 100644
--- 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 */
diff --git a/net/can/gw.c b/net/can/gw.c
index acdd4656cc3b..c185fcd5e828 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -381,9 +381,7 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data)
 
         /* is sending the skb back to the incoming interface not allowed? */
         if (!(gwj->flags & CGW_FLAGS_CAN_IIF_TX_OK) &&
-            skb_headroom(skb) == sizeof(struct can_skb_priv) &&
-            (((struct can_skb_priv *)(skb->head))->ifindex ==
-             gwj->dst.dev->ifindex))
+            can_skb_prv(skb)->ifindex == gwj->dst.dev->ifindex)
                 return;
 
         /*
diff --git a/net/can/raw.c b/net/can/raw.c
index 5d860e8dcc52..c1764e41ddaf 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -705,8 +705,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (!skb)
                 goto put_dev;
 
-        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;
 
         err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
         if (err < 0)