Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bf3440d authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

can: rework skb reserved data handling 



Added accessor and skb_reserve helpers for struct can_skb_priv.
Removed pointless skb_headroom() check.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
CC: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cef401de

drivers/net/can/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

drivers/net/can/slcan.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

include/linux/can/skb.h

+10 −0
Original line number Diff line number Diff line
@@ -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 */

net/can/bcm.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */

net/can/gw.c

+1 −3
Original line number Diff line number Diff line
@@ -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;



	/*