mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 15:27:29 +00:00
[NETFILTER]: Fix connection tracking bug in 2.6.12
In 2.6.12 we started dropping the conntrack reference when a packet leaves the IP layer. This broke connection tracking on a bridge, because bridge-netfilter defers calling some NF_IP_* hooks to the bridge layer for locally generated packets going out a bridge, where the conntrack reference is no longer available. This patch keeps the reference in this case as a temporary solution, long term we will remove the defered hook calling. No attempt is made to drop the reference in the bridge-code when it is no longer needed, tc actions could already have sent the packet anywhere. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
bcd61272db
commit
9666dae510
2 changed files with 8 additions and 2 deletions
|
@ -188,7 +188,13 @@ static inline int ip_finish_output2(struct sk_buff *skb)
|
|||
skb = skb2;
|
||||
}
|
||||
|
||||
nf_reset(skb);
|
||||
#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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue