Skip to content

L
linux
Commit 08506b24 authored by Bart Samwel's avatar Bart Samwel Committed by James Morris
Browse files
Options

[NET]: Return 'unsigned char *' from *skb_pull*() routines.

parent b022a38e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/skbuff.h
View file @ 08506b24
...@@ -871,7 +871,7 @@ static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len) ...@@ -871,7 +871,7 @@ static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
return skb->data; return skb->data;
} }
static inline char *__skb_pull(struct sk_buff *skb, unsigned int len) static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
{ {
skb->len -= len; skb->len -= len;
BUG_ON(skb->len < skb->data_len); BUG_ON(skb->len < skb->data_len);
...@@ -895,7 +895,7 @@ static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) ...@@ -895,7 +895,7 @@ static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
static inline char *__pskb_pull(struct sk_buff *skb, unsigned int len) static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
{ {
if (len > skb_headlen(skb) && if (len > skb_headlen(skb) &&
!__pskb_pull_tail(skb, len-skb_headlen(skb))) !__pskb_pull_tail(skb, len-skb_headlen(skb)))
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7