diff options
| author |  Richard Gobert <richardbgobert@gmail.com>
| 2022-09-28 14:55:31 +0200 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2022-09-30 12:31:46 +0100 |
| commit | d427c8999b071af2003203b42a007c4a80156c18 (patch) | |
| tree | 60f7796211722aabd9ef73237e93d29c0177dcdb /include/linux/skbuff.h | |
| parent | net: bonding: Convert to use sysfs_emit()/sysfs_emit_at() APIs (diff) | |
| download | linux-d427c8999b071af2003203b42a007c4a80156c18.tar.gz linux-d427c8999b071af2003203b42a007c4a80156c18.tar.bz2 linux-d427c8999b071af2003203b42a007c4a80156c18.zip | |
net-next: skbuff: refactor pskb_pull
pskb_may_pull already contains all of the checks performed by
pskb_pull.
Use pskb_may_pull for validation in pskb_pull, eliminating the
duplication and making __pskb_pull obsolete.
Replace __pskb_pull with pskb_pull where applicable.
Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 920eb6413fee..9fcf534f2d92 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2616,20 +2616,6 @@ void *skb_pull_data(struct sk_buff *skb, size_t len); void *__pskb_pull_tail(struct sk_buff *skb, int delta); -static inline void *__pskb_pull(struct sk_buff *skb, unsigned int len) -{ - if (len > skb_headlen(skb) && - !__pskb_pull_tail(skb, len - skb_headlen(skb))) - return NULL; - skb->len -= len; - return skb->data += len; -} - -static inline void *pskb_pull(struct sk_buff *skb, unsigned int len) -{ - return unlikely(len > skb->len) ? NULL : __pskb_pull(skb, len); -} - static inline bool pskb_may_pull(struct sk_buff *skb, unsigned int len) { if (likely(len <= skb_headlen(skb))) @@ -2639,6 +2625,15 @@ static inline bool pskb_may_pull(struct sk_buff *skb, unsigned int len) return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL; } +static inline void *pskb_pull(struct sk_buff *skb, unsigned int len) +{ + if (!pskb_may_pull(skb, len)) + return NULL; + + skb->len -= len; + return skb->data += len; +} + void skb_condense(struct sk_buff *skb); /** |