: ipv6: Use frag list abstraction interfaces.
Subsystems (3)
David Miller
maintainerPATCH 10/15 : ipv6: Use frag list abstraction interfaces.
Signed-off-by David S. Miller <[email protected]>
--- net/ipv6/ip6_output.c | 6 +++--- net/ipv6/reassembly.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
net/ipv6/ip6_output.c +3 -3
@@ -658,7 +658,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) } mtu -= hlen +sizeof (struct frag_hdr ); -if (skb_shinfo (skb)->frag_list) { +if (skb_has_frags (skb)) {int first_len =skb_pagelen (skb);int truesizes =0 ;
@@ -667,7 +667,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) skb_cloned(skb)) goto slow_path; -for (frag =skb_shinfo (skb)->frag_list; frag; frag = frag->next) { + skb_walk_frags(skb, frag) {/* Correct geometry. */ if (frag->len > mtu || ((frag->len & 7) && frag->next) ||
@@ -690,7 +690,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) err =0 ; offset =0 ; frag =skb_shinfo (skb)->frag_list; -skb_shinfo (skb)->frag_list =NULL ; +skb_frag_list_init (skb);/* BUILD HEADER */ *prevhdr =NEXTHDR_FRAGMENT ;
net/ipv6/reassembly.c +2 -2
@@ -494,7 +494,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,/* If the first fragment is fragmented itself, we split * it to two chunks: the first with data and paged part * and the second, holding only fragments. */ -if (skb_shinfo (head)->frag_list) { +if (skb_has_frags (head)) {struct sk_buff *clone;int i, plen =0 ;
@@ -503,7 +503,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, clone->next = head->next; head->next = clone;skb_shinfo (clone)->frag_list =skb_shinfo (head)->frag_list; -skb_shinfo (head)->frag_list =NULL ; +skb_frag_list_init (head);for (i=0 ; i<skb_shinfo (head)->nr_frags; i++) plen +=skb_shinfo (head)->frags[i].size; clone->len = clone->data_len = head->data_len - plen;
Signature · 1 line
1.6.3.2