History

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.

Cambda Zhu committed 6 years ago

Commit a08e7fd1 parent 3b857206 files · +9 −9Browse files

Unified · Split

6 files
  1. include/linux/skbuff.h +2 −2
  2. net/core/dev.c +2 −2
  3. net/ipv4/ip_output.c +1 −1
  4. net/ipv4/udp.c +1 −1
  5. net/openvswitch/datapath.c +1 −1
  6. net/xfrm/xfrm_output.c +2 −2
include/linux/skbuff.h+2−2
@@ -4389,8 +4389,8 @@ struct skb_gso_cb { · 4388 unmodified lines
43894389 __wsum csum;
43904390 __u16 csum_start;
43914391 };
4392−#define SKB_SGO_CB_OFFSET 32
4393−#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_SGO_CB_OFFSET))
4392+#define SKB_GSO_CB_OFFSET 32
4393+#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_GSO_CB_OFFSET))
43944394
43954395 static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)
43964396 {
net/core/dev.c+2−2
@@ -3266,7 +3266,7 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) · 3265 unmodified lines
32663266 * It may return NULL if the skb requires no segmentation. This is
32673267 * only possible when GSO is used for verifying header integrity.
32683268 *
3269− * Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb.
3269+ * Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb.
32703270 */
32713271 struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
32723272 netdev_features_t features, bool tx_path)
@@ -3295,7 +3295,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, · 22 unmodified lines
32953295 features &= ~NETIF_F_GSO_PARTIAL;
32963296 }
32973297
3298− BUILD_BUG_ON(SKB_SGO_CB_OFFSET +
3298+ BUILD_BUG_ON(SKB_GSO_CB_OFFSET +
32993299 sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb));
33003300
33013301 SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb);
net/ipv4/ip_output.c+1−1
@@ -263,7 +263,7 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk, · 262 unmodified lines
263263 * insufficent MTU.
264264 */
265265 features = netif_skb_features(skb);
266− BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET);
266+ BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_GSO_CB_OFFSET);
267267 segs = skb_gso_segment(skb, features & ~NETIF_F_GSO_MASK);
268268 if (IS_ERR_OR_NULL(segs)) {
269269 kfree_skb(skb);
net/ipv4/udp.c+1−1
@@ -2109,7 +2109,7 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) · 2108 unmodified lines
21092109 if (likely(!udp_unexpected_gso(sk, skb)))
21102110 return udp_queue_rcv_one_skb(sk, skb);
21112111
2112− BUILD_BUG_ON(sizeof(struct udp_skb_cb) > SKB_SGO_CB_OFFSET);
2112+ BUILD_BUG_ON(sizeof(struct udp_skb_cb) > SKB_GSO_CB_OFFSET);
21132113 __skb_push(skb, -skb_mac_offset(skb));
21142114 segs = udp_rcv_segment(sk, skb, true);
21152115 skb_list_walk_safe(segs, skb, next) {
net/openvswitch/datapath.c+1−1
@@ -305,7 +305,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb, · 304 unmodified lines
305305 struct sk_buff *segs, *nskb;
306306 int err;
307307
308− BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_SGO_CB_OFFSET);
308+ BUILD_BUG_ON(sizeof(*OVS_CB(skb)) > SKB_GSO_CB_OFFSET);
309309 segs = __skb_gso_segment(skb, NETIF_F_SG, false);
310310 if (IS_ERR(segs))
311311 return PTR_ERR(segs);
net/xfrm/xfrm_output.c+2−2
@@ -535,8 +535,8 @@ static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb · 534 unmodified lines
535535 {
536536 struct sk_buff *segs, *nskb;
537537
538− BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET);
539− BUILD_BUG_ON(sizeof(*IP6CB(skb)) > SKB_SGO_CB_OFFSET);
538+ BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_GSO_CB_OFFSET);
539+ BUILD_BUG_ON(sizeof(*IP6CB(skb)) > SKB_GSO_CB_OFFSET);
540540 segs = skb_gso_segment(skb, 0);
541541 kfree_skb(skb);
542542 if (IS_ERR(segs))