[NETFILTER]: ip_ct_gather_frags no longer needs to linearize.

f20cc5e1 · David S. Miller · 93709d7d · f20cc5e1
Commit f20cc5e1 authored May 12, 2003 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

net/ipv4/netfilter/ip_conntrack_core.c net/ipv4/netfilter/ip_conntrack_core.c +2 -5

No files found.
--- 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) {