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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

Browse Source
This commit is contained in:
Patrick McHardy
2009-06-11 16:00:49 +02:00
parent 440f0d5885 bb400801c2
commit 36432dae73
518 changed files with 20761 additions and 11393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/netfilter/ip6t_REJECT.c
View File

@@ -112,7 +112,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
return;
}
nskb->dst = dst;
skb_dst_set(nskb, dst);
skb_reserve(nskb, hh_len + dst->header_len);

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
* 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;
@@ -420,7 +420,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
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;