lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: Use frag list abstraction interfaces.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2009-06-09 00:23:58 -07:00
parent 4d9092bb41
commit 343a99724e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/netfilter/nf_nat_proto_sctp.c
View File

@@ -33,6 +33,7 @@ sctp_manip_pkt(struct sk_buff *skb,
enum nf_nat_manip_type maniptype) enum nf_nat_manip_type maniptype)
{ {
const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);
struct sk_buff *frag;
sctp_sctphdr_t *hdr; sctp_sctphdr_t *hdr;
unsigned int hdroff = iphdroff + iph->ihl*4; unsigned int hdroff = iphdroff + iph->ihl*4;
__be32 oldip, newip; __be32 oldip, newip;
@@ -57,8 +58,8 @@ sctp_manip_pkt(struct sk_buff *skb,
} }
crc32 = sctp_start_cksum((u8 *)hdr, skb_headlen(skb) - hdroff); crc32 = sctp_start_cksum((u8 *)hdr, skb_headlen(skb) - hdroff);
for (skb = skb_shinfo(skb)->frag_list; skb; skb = skb->next) skb_walk_frags(skb, frag);
crc32 = sctp_update_cksum((u8 *)skb->data, skb_headlen(skb), crc32 = sctp_update_cksum((u8 *)frag->data, skb_headlen(frag),
crc32); crc32);
crc32 = sctp_end_cksum(crc32); crc32 = sctp_end_cksum(crc32);
hdr->checksum = crc32; hdr->checksum = crc32;

4
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@@ -409,7 +409,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
/* If the first fragment is fragmented itself, we split /* If the first fragment is fragmented itself, we split
* it to two chunks: the first with data and paged part * it to two chunks: the first with data and paged part
* and the second, holding only fragments. */ * and the second, holding only fragments. */
if (skb_shinfo(head)->frag_list) { if (skb_has_frags(head)) {
struct sk_buff *clone; struct sk_buff *clone;
int i, plen = 0; int i, plen = 0;
@@ -420,7 +420,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
clone->next = head->next; clone->next = head->next;
head->next = clone; head->next = clone;
skb_shinfo(clone)->frag_list = skb_shinfo(head)->frag_list; 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++) for (i=0; i<skb_shinfo(head)->nr_frags; i++)
plen += skb_shinfo(head)->frags[i].size; plen += skb_shinfo(head)->frags[i].size;
clone->len = clone->data_len = head->data_len - plen; clone->len = clone->data_len = head->data_len - plen;