diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-12 01:36:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-12 01:36:10 -0700 |
| commit | f20cc5e15ebf76c7d2e173cbaefaf1766c787b6c (patch) | |
| tree | f35c1ebc171534feb843e2a06eefea3f7e5b2800 | |
| parent | 93709d7dfc4bb93fe9682e80d73a4678525293ab (diff) | |
[NETFILTER]: ip_ct_gather_frags no longer needs to linearize.
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 48aea8927526..37ced15b419d 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -1188,12 +1188,9 @@ ip_ct_gather_frags(struct sk_buff *skb) local_bh_enable(); if (!skb) { - if (sk) sock_put(sk); + if (sk) + sock_put(sk); return skb; - } else if (skb_is_nonlinear(skb) && skb_linearize(skb, GFP_ATOMIC) != 0) { - kfree_skb(skb); - if (sk) sock_put(sk); - return NULL; } if (sk) { |