Commit 35d04610 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

net: clean up skb headers code 



commit 1a37e412 (net: Use 16bits for *_headers
fields of struct skbuff) converts skb->*_header to u16,
some #if NET_SKBUFF_DATA_USES_OFFSET are now useless,
and to be safe, we could just use "X = (typeof(X)) ~0U;"
as suggested by David.

Cc: David S. Miller <davem@davemloft.net>
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 938177e9

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static inline void skb_set_inner_mac_header(struct sk_buff *skb, 
}

static inline bool skb_transport_header_was_set(const struct sk_buff *skb)

{

	return skb->transport_header != ~0U;

	return skb->transport_header != (typeof(skb->transport_header))~0U;

}



static inline unsigned char *skb_transport_header(const struct sk_buff *skb)
@@ -1636,7 +1636,7 @@ static inline unsigned char *skb_mac_header(const struct sk_buff *skb) 


static inline int skb_mac_header_was_set(const struct sk_buff *skb)

{

	return skb->mac_header != ~0U;

	return skb->mac_header != (typeof(skb->mac_header))~0U;

}



static inline void skb_reset_mac_header(struct sk_buff *skb)

net/core/skbuff.c

+5 −11
Original line number Diff line number Diff line
@@ -199,9 +199,7 @@ struct sk_buff *__alloc_skb_head(gfp_t gfp_mask, int node) 
	skb->truesize = sizeof(struct sk_buff);

	atomic_set(&skb->users, 1);



#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->mac_header = (__u16) ~0U;

#endif

	skb->mac_header = (typeof(skb->mac_header))~0U;

out:

	return skb;

}
@@ -275,10 +273,8 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, 
	skb->data = data;

	skb_reset_tail_pointer(skb);

	skb->end = skb->tail + size;

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->mac_header = (__u16) ~0U;

	skb->transport_header = (__u16) ~0U;

#endif

	skb->mac_header = (typeof(skb->mac_header))~0U;

	skb->transport_header = (typeof(skb->transport_header))~0U;



	/* make sure we initialize shinfo sequentially */

	shinfo = skb_shinfo(skb);
@@ -344,10 +340,8 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size) 
	skb->data = data;

	skb_reset_tail_pointer(skb);

	skb->end = skb->tail + size;

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	skb->mac_header = (__u16) ~0U;

	skb->transport_header = (__u16) ~0U;

#endif

	skb->mac_header = (typeof(skb->mac_header))~0U;

	skb->transport_header = (typeof(skb->transport_header))~0U;



	/* make sure we initialize shinfo sequentially */

	shinfo = skb_shinfo(skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE