Commit a08e7fd9 authored by Cambda Zhu's avatar Cambda Zhu Committed by David S. Miller
Browse files

net: Fix typo of SKB_SGO_CB_OFFSET 



The SKB_SGO_CB_OFFSET should be SKB_GSO_CB_OFFSET which means the
offset of the GSO in skb cb. This patch fixes the typo.

Fixes: 9207f9d4 ("net: preserve IP control block during GSO segmentation")
Signed-off-by: default avatarCambda Zhu <cambda@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b85720d

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -4389,8 +4389,8 @@ struct skb_gso_cb { 
	__wsum	csum;

	__u16	csum_start;

};

#define SKB_SGO_CB_OFFSET	32

#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_SGO_CB_OFFSET))

#define SKB_GSO_CB_OFFSET	32

#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_GSO_CB_OFFSET))



static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)

{

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -3266,7 +3266,7 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) 
 *	It may return NULL if the skb requires no segmentation.  This is

 *	only possible when GSO is used for verifying header integrity.

 *

 *	Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb.

 *	Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb.

 */

struct sk_buff *__skb_gso_segment(struct sk_buff *skb,

				  netdev_features_t features, bool tx_path)
@@ -3295,7 +3295,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, 
			features &= ~NETIF_F_GSO_PARTIAL;

	}



	BUILD_BUG_ON(SKB_SGO_CB_OFFSET +

	BUILD_BUG_ON(SKB_GSO_CB_OFFSET +

		     sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb));



	SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb);

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk, 
	 *    insufficent MTU.

	 */

	features = netif_skb_features(skb);

	BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET);

	BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_GSO_CB_OFFSET);

	segs = skb_gso_segment(skb, features & ~NETIF_F_GSO_MASK);

	if (IS_ERR_OR_NULL(segs)) {

		kfree_skb(skb);

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -2109,7 +2109,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	if (likely(!udp_unexpected_gso(sk, skb)))

		return udp_queue_rcv_one_skb(sk, skb);



	BUILD_BUG_ON(sizeof(struct udp_skb_cb) > SKB_SGO_CB_OFFSET);

	BUILD_BUG_ON(sizeof(struct udp_skb_cb) > SKB_GSO_CB_OFFSET);

	__skb_push(skb, -skb_mac_offset(skb));

	segs = udp_rcv_segment(sk, skb, true);

	skb_list_walk_safe(segs, skb, next) {

net/openvswitch/datapath.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, 
	struct sk_buff *segs, *nskb;

	int err;



	BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_SGO_CB_OFFSET);

	BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_GSO_CB_OFFSET);

	segs = __skb_gso_segment(skb, NETIF_F_SG, false);

	if (IS_ERR(segs))

		return PTR_ERR(segs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE