aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/skbuff.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c199aa428c6d..4d085d454285 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -951,17 +951,6 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
951 fastpath = atomic_read(&skb_shinfo(skb)->dataref) == delta; 951 fastpath = atomic_read(&skb_shinfo(skb)->dataref) == delta;
952 } 952 }
953 953
954 if (fastpath && !skb->head_frag &&
955 size + sizeof(struct skb_shared_info) <= ksize(skb->head)) {
956 memmove(skb->head + size, skb_shinfo(skb),
957 offsetof(struct skb_shared_info,
958 frags[skb_shinfo(skb)->nr_frags]));
959 memmove(skb->head + nhead, skb->head,
960 skb_tail_pointer(skb) - skb->head);
961 off = nhead;
962 goto adjust_others;
963 }
964
965 data = kmalloc(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), 954 data = kmalloc(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
966 gfp_mask); 955 gfp_mask);
967 if (!data) 956 if (!data)
@@ -997,7 +986,6 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
997 986
998 skb->head = data; 987 skb->head = data;
999 skb->head_frag = 0; 988 skb->head_frag = 0;
1000adjust_others:
1001 skb->data += off; 989 skb->data += off;
1002#ifdef NET_SKBUFF_DATA_USES_OFFSET 990#ifdef NET_SKBUFF_DATA_USES_OFFSET
1003 skb->end = size; 991 skb->end = size;