|
@@ -867,6 +867,17 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
|
|
|
}
|
|
|
EXPORT_SYMBOL(skb_clone);
|
|
|
|
|
|
+static void skb_headers_offset_update(struct sk_buff *skb, int off)
|
|
|
+{
|
|
|
+ /* {transport,network,mac}_header and tail are relative to skb->head */
|
|
|
+ skb->transport_header += off;
|
|
|
+ skb->network_header += off;
|
|
|
+ if (skb_mac_header_was_set(skb))
|
|
|
+ skb->mac_header += off;
|
|
|
+ skb->inner_transport_header += off;
|
|
|
+ skb->inner_network_header += off;
|
|
|
+}
|
|
|
+
|
|
|
static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
|
|
|
{
|
|
|
#ifndef NET_SKBUFF_DATA_USES_OFFSET
|
|
@@ -879,13 +890,7 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
|
|
|
__copy_skb_header(new, old);
|
|
|
|
|
|
#ifndef NET_SKBUFF_DATA_USES_OFFSET
|
|
|
- /* {transport,network,mac}_header are relative to skb->head */
|
|
|
- new->transport_header += offset;
|
|
|
- new->network_header += offset;
|
|
|
- if (skb_mac_header_was_set(new))
|
|
|
- new->mac_header += offset;
|
|
|
- new->inner_transport_header += offset;
|
|
|
- new->inner_network_header += offset;
|
|
|
+ skb_headers_offset_update(new, offset);
|
|
|
#endif
|
|
|
skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
|
|
|
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
|
|
@@ -1077,14 +1082,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
|
|
|
#else
|
|
|
skb->end = skb->head + size;
|
|
|
#endif
|
|
|
- /* {transport,network,mac}_header and tail are relative to skb->head */
|
|
|
skb->tail += off;
|
|
|
- skb->transport_header += off;
|
|
|
- skb->network_header += off;
|
|
|
- if (skb_mac_header_was_set(skb))
|
|
|
- skb->mac_header += off;
|
|
|
- skb->inner_transport_header += off;
|
|
|
- skb->inner_network_header += off;
|
|
|
+ skb_headers_offset_update(skb, off);
|
|
|
/* Only adjust this if it actually is csum_start rather than csum */
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL)
|
|
|
skb->csum_start += nhead;
|
|
@@ -1180,12 +1179,7 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
|
|
|
if (n->ip_summed == CHECKSUM_PARTIAL)
|
|
|
n->csum_start += off;
|
|
|
#ifdef NET_SKBUFF_DATA_USES_OFFSET
|
|
|
- n->transport_header += off;
|
|
|
- n->network_header += off;
|
|
|
- if (skb_mac_header_was_set(skb))
|
|
|
- n->mac_header += off;
|
|
|
- n->inner_transport_header += off;
|
|
|
- n->inner_network_header += off;
|
|
|
+ skb_headers_offset_update(n, off);
|
|
|
#endif
|
|
|
|
|
|
return n;
|