diff options
-rw-r--r-- | include/linux/skbuff.h | 16 | ||||
-rw-r--r-- | net/core/skbuff.c | 16 |
2 files changed, 17 insertions, 15 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f085955cb5a7..6d6cde7b243c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -927,6 +927,7 @@ static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len) | |||
927 | return skb->data; | 927 | return skb->data; |
928 | } | 928 | } |
929 | 929 | ||
930 | extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len); | ||
930 | static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) | 931 | static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) |
931 | { | 932 | { |
932 | skb->len -= len; | 933 | skb->len -= len; |
@@ -934,21 +935,6 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) | |||
934 | return skb->data += len; | 935 | return skb->data += len; |
935 | } | 936 | } |
936 | 937 | ||
937 | /** | ||
938 | * skb_pull - remove data from the start of a buffer | ||
939 | * @skb: buffer to use | ||
940 | * @len: amount of data to remove | ||
941 | * | ||
942 | * This function removes data from the start of a buffer, returning | ||
943 | * the memory to the headroom. A pointer to the next data in the buffer | ||
944 | * is returned. Once the data has been pulled future pushes will overwrite | ||
945 | * the old data. | ||
946 | */ | ||
947 | static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) | ||
948 | { | ||
949 | return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); | ||
950 | } | ||
951 | |||
952 | extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); | 938 | extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); |
953 | 939 | ||
954 | static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) | 940 | static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3402eca768f8..cf489b6329e8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -878,6 +878,22 @@ unsigned char *skb_put(struct sk_buff *skb, unsigned int len) | |||
878 | } | 878 | } |
879 | EXPORT_SYMBOL(skb_put); | 879 | EXPORT_SYMBOL(skb_put); |
880 | 880 | ||
881 | /** | ||
882 | * skb_pull - remove data from the start of a buffer | ||
883 | * @skb: buffer to use | ||
884 | * @len: amount of data to remove | ||
885 | * | ||
886 | * This function removes data from the start of a buffer, returning | ||
887 | * the memory to the headroom. A pointer to the next data in the buffer | ||
888 | * is returned. Once the data has been pulled future pushes will overwrite | ||
889 | * the old data. | ||
890 | */ | ||
891 | unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) | ||
892 | { | ||
893 | return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); | ||
894 | } | ||
895 | EXPORT_SYMBOL(skb_pull); | ||
896 | |||
881 | /* Trims skb to length len. It can change skb pointers. | 897 | /* Trims skb to length len. It can change skb pointers. |
882 | */ | 898 | */ |
883 | 899 | ||