Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81912
b: refs/heads/master
c: 99fa5f5
h: refs/heads/master
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Feb 1, 2008
1 parent fa57bce commit 972646a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b0a6363c2418c93f25dd30b8ffcd3fdd4ce23ad6
refs/heads/master: 99fa5f53975b4c09beb5d11ed7418fee2dfb43e3
16 changes: 1 addition & 15 deletions trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <net/rawv6.h>
#include <net/ndisc.h>
#include <net/addrconf.h>
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
#include <linux/sysctl.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv6.h>
Expand Down Expand Up @@ -680,21 +681,6 @@ void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
nf_conntrack_put_reasm(skb);
}

int nf_ct_frag6_kfree_frags(struct sk_buff *skb)
{
struct sk_buff *s, *s2;

for (s = NFCT_FRAG6_CB(skb)->orig; s; s = s2) {

s2 = s->next;
kfree_skb(s);
}

kfree_skb(skb);

return 0;
}

int nf_ct_frag6_init(void)
{
nf_frags.hashfn = nf_hashfn;
Expand Down

0 comments on commit 972646a

Please sign in to comment.