Skip to content

Commit

Permalink
skbuff: skb_segment: s/skb_frag/frag/
Browse files Browse the repository at this point in the history
skb_frag can in fact point at either skb
or fskb so rename it generally "frag".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael S. Tsirkin authored and David S. Miller committed Mar 11, 2014
1 parent 8cb1990 commit 4e1beba
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -2850,7 +2850,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
struct sk_buff *segs = NULL;
struct sk_buff *tail = NULL;
struct sk_buff *fskb = skb_shinfo(skb)->frag_list;
skb_frag_t *skb_frag = skb_shinfo(skb)->frags;
skb_frag_t *frag = skb_shinfo(skb)->frags;
unsigned int mss = skb_shinfo(skb)->gso_size;
unsigned int doffset = skb->data - skb_mac_header(skb);
unsigned int offset = doffset;
Expand Down Expand Up @@ -2896,19 +2896,19 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)

i = 0;
nfrags = skb_shinfo(fskb)->nr_frags;
skb_frag = skb_shinfo(fskb)->frags;
frag = skb_shinfo(fskb)->frags;
pos += skb_headlen(fskb);

while (pos < offset + len) {
BUG_ON(i >= nfrags);

size = skb_frag_size(skb_frag);
size = skb_frag_size(frag);
if (pos + size > offset + len)
break;

i++;
pos += size;
skb_frag++;
frag++;
}

nskb = skb_clone(fskb, GFP_ATOMIC);
Expand Down Expand Up @@ -2982,7 +2982,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)

i = 0;
nfrags = skb_shinfo(fskb)->nr_frags;
skb_frag = skb_shinfo(fskb)->frags;
frag = skb_shinfo(fskb)->frags;

BUG_ON(!nfrags);

Expand All @@ -2997,7 +2997,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
goto err;
}

*nskb_frag = *skb_frag;
*nskb_frag = *frag;
__skb_frag_ref(nskb_frag);
size = skb_frag_size(nskb_frag);

Expand All @@ -3010,7 +3010,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)

if (pos + size <= offset + len) {
i++;
skb_frag++;
frag++;
pos += size;
} else {
skb_frag_size_sub(nskb_frag, pos + size - (offset + len));
Expand Down

0 comments on commit 4e1beba

Please sign in to comment.