Commit e7fb29af authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Jiri Slaby

skbuff: skb_segment: s/frag/nskb_frag/

[ Upstream commit 8cb19905 ]

frag points at nskb, so name it appropriately
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent e6e3ee68
...@@ -2753,7 +2753,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) ...@@ -2753,7 +2753,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
do { do {
struct sk_buff *nskb; struct sk_buff *nskb;
skb_frag_t *frag; skb_frag_t *nskb_frag;
int hsize; int hsize;
int size; int size;
...@@ -2853,7 +2853,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) ...@@ -2853,7 +2853,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
continue; continue;
} }
frag = skb_shinfo(nskb)->frags; nskb_frag = skb_shinfo(nskb)->frags;
skb_copy_from_linear_data_offset(skb, offset, skb_copy_from_linear_data_offset(skb, offset,
skb_put(nskb, hsize), hsize); skb_put(nskb, hsize), hsize);
...@@ -2881,13 +2881,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) ...@@ -2881,13 +2881,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
goto err; goto err;
} }
*frag = *skb_frag; *nskb_frag = *skb_frag;
__skb_frag_ref(frag); __skb_frag_ref(nskb_frag);
size = skb_frag_size(frag); size = skb_frag_size(nskb_frag);
if (pos < offset) { if (pos < offset) {
frag->page_offset += offset - pos; nskb_frag->page_offset += offset - pos;
skb_frag_size_sub(frag, offset - pos); skb_frag_size_sub(nskb_frag, offset - pos);
} }
skb_shinfo(nskb)->nr_frags++; skb_shinfo(nskb)->nr_frags++;
...@@ -2897,11 +2897,11 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) ...@@ -2897,11 +2897,11 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
skb_frag++; skb_frag++;
pos += size; pos += size;
} else { } else {
skb_frag_size_sub(frag, pos + size - (offset + len)); skb_frag_size_sub(nskb_frag, pos + size - (offset + len));
goto skip_fraglist; goto skip_fraglist;
} }
frag++; nskb_frag++;
} }
skip_fraglist: skip_fraglist:
......
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