AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

net: clean up skb headers code

Browse Source 
commit 1a37e412a0 (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: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cong Wang 2013-05-29 15:16:05 +08:00 committed by David S. Miller
parent 938177e9f3
commit 35d0461061
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/skbuff.h
View File

@ -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) 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) 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) 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) static inline void skb_reset_mac_header(struct sk_buff *skb)

16
net/core/skbuff.c
View File

@ -199,9 +199,7 @@ struct sk_buff *__alloc_skb_head(gfp_t gfp_mask, int node)
skb->truesize = sizeof(struct sk_buff); skb->truesize = sizeof(struct sk_buff);
atomic_set(&skb->users, 1); atomic_set(&skb->users, 1);
#ifdef NET_SKBUFF_DATA_USES_OFFSET skb->mac_header = (typeof(skb->mac_header))~0U;
skb->mac_header = (__u16) ~0U;
#endif
out: out:
return skb; return skb;
} }
@ -275,10 +273,8 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
skb->data = data; skb->data = data;
skb_reset_tail_pointer(skb); skb_reset_tail_pointer(skb);
skb->end = skb->tail + size; skb->end = skb->tail + size;
#ifdef NET_SKBUFF_DATA_USES_OFFSET skb->mac_header = (typeof(skb->mac_header))~0U;
skb->mac_header = (__u16) ~0U; skb->transport_header = (typeof(skb->transport_header))~0U;
skb->transport_header = (__u16) ~0U;
#endif
/* make sure we initialize shinfo sequentially */ /* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb); shinfo = skb_shinfo(skb);
@ -344,10 +340,8 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
skb->data = data; skb->data = data;
skb_reset_tail_pointer(skb); skb_reset_tail_pointer(skb);
skb->end = skb->tail + size; skb->end = skb->tail + size;
#ifdef NET_SKBUFF_DATA_USES_OFFSET skb->mac_header = (typeof(skb->mac_header))~0U;
skb->mac_header = (__u16) ~0U; skb->transport_header = (typeof(skb->transport_header))~0U;
skb->transport_header = (__u16) ~0U;
#endif
/* make sure we initialize shinfo sequentially */ /* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb); shinfo = skb_shinfo(skb);