diff options
| author | Phil Oester <kernel@linuxace.com> | 2005-07-12 22:57:52 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-12 22:57:52 +0400 |
| commit | 84531c24f27b02daa8e54e2bb6dc74a730fdf0a5 (patch) | |
| tree | 756825122b40af8ea2db132e8c9033d9ab3785e5 /net/ipv4/ip_output.c | |
| parent | 6a2e9b738cb5c929df73b6acabdd8f9a4e9a0416 (diff) | |
| download | linux-84531c24f27b02daa8e54e2bb6dc74a730fdf0a5.tar.xz | |
[NETFILTER]: Revert nf_reset change
Revert the nf_reset change that caused so much trouble, drop conntrack
references manually before packets are queued to packet sockets.
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 9de83e6e0f1d..80d13103b2b0 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -107,7 +107,6 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb) newskb->pkt_type = PACKET_LOOPBACK; newskb->ip_summed = CHECKSUM_UNNECESSARY; BUG_TRAP(newskb->dst); - nf_reset(newskb); netif_rx(newskb); return 0; } @@ -188,14 +187,6 @@ static inline int ip_finish_output2(struct sk_buff *skb) skb = skb2; } -#ifdef CONFIG_BRIDGE_NETFILTER - /* bridge-netfilter defers calling some IP hooks to the bridge layer - * and still needs the conntrack reference. - */ - if (skb->nf_bridge == NULL) -#endif - nf_reset(skb); - if (hh) { int hh_alen; |