Commit 483126b3 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller

skbuff: make __build_skb_around() return void

__build_skb_around() can never fail and always returns passed skb.
Make it return void to simplify and optimize the code.
Signed-off-by: default avatarAlexander Lobakin <alobakin@pm.me>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef28095f
...@@ -120,8 +120,8 @@ static void skb_under_panic(struct sk_buff *skb, unsigned int sz, void *addr) ...@@ -120,8 +120,8 @@ static void skb_under_panic(struct sk_buff *skb, unsigned int sz, void *addr)
} }
/* Caller must provide SKB that is memset cleared */ /* Caller must provide SKB that is memset cleared */
static struct sk_buff *__build_skb_around(struct sk_buff *skb, static void __build_skb_around(struct sk_buff *skb, void *data,
void *data, unsigned int frag_size) unsigned int frag_size)
{ {
struct skb_shared_info *shinfo; struct skb_shared_info *shinfo;
unsigned int size = frag_size ? : ksize(data); unsigned int size = frag_size ? : ksize(data);
...@@ -144,8 +144,6 @@ static struct sk_buff *__build_skb_around(struct sk_buff *skb, ...@@ -144,8 +144,6 @@ static struct sk_buff *__build_skb_around(struct sk_buff *skb,
atomic_set(&shinfo->dataref, 1); atomic_set(&shinfo->dataref, 1);
skb_set_kcov_handle(skb, kcov_common_handle()); skb_set_kcov_handle(skb, kcov_common_handle());
return skb;
} }
/** /**
...@@ -176,8 +174,9 @@ struct sk_buff *__build_skb(void *data, unsigned int frag_size) ...@@ -176,8 +174,9 @@ struct sk_buff *__build_skb(void *data, unsigned int frag_size)
return NULL; return NULL;
memset(skb, 0, offsetof(struct sk_buff, tail)); memset(skb, 0, offsetof(struct sk_buff, tail));
__build_skb_around(skb, data, frag_size);
return __build_skb_around(skb, data, frag_size); return skb;
} }
/* build_skb() is wrapper over __build_skb(), that specifically /* build_skb() is wrapper over __build_skb(), that specifically
...@@ -210,9 +209,9 @@ struct sk_buff *build_skb_around(struct sk_buff *skb, ...@@ -210,9 +209,9 @@ struct sk_buff *build_skb_around(struct sk_buff *skb,
if (unlikely(!skb)) if (unlikely(!skb))
return NULL; return NULL;
skb = __build_skb_around(skb, data, frag_size); __build_skb_around(skb, data, frag_size);
if (skb && frag_size) { if (frag_size) {
skb->head_frag = 1; skb->head_frag = 1;
if (page_is_pfmemalloc(virt_to_head_page(data))) if (page_is_pfmemalloc(virt_to_head_page(data)))
skb->pfmemalloc = 1; skb->pfmemalloc = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment