diff options
| author | David S. Miller <davem@davemloft.net> | 2022-03-28 08:57:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-28 08:57:10 -0700 |
| commit | 2aa2f88c970783633da3d248ab3df7e15a416eca (patch) | |
| tree | 7d74f1d35ccd72b1af22a8225cba65c42148a146 /include | |
| parent | bcb74e132a76ce0502bb33d5b65533a4ed72d159 (diff) | |
| parent | 33758c891479ea1c736abfee64b5225925875557 (diff) | |
| download | linux-2aa2f88c970783633da3d248ab3df7e15a416eca.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Incorrect output device in nf_egress hook, from Phill Sutter.
2) Preserve liberal flag in TCP conntrack state, reported by Sven Auhagen.
3) Use GFP_KERNEL_ACCOUNT flag for nf_tables objects, from Vasily Averin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter_netdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter_netdev.h b/include/linux/netfilter_netdev.h index e6487a691136..8676316547cc 100644 --- a/include/linux/netfilter_netdev.h +++ b/include/linux/netfilter_netdev.h @@ -99,7 +99,7 @@ static inline struct sk_buff *nf_hook_egress(struct sk_buff *skb, int *rc, return skb; nf_hook_state_init(&state, NF_NETDEV_EGRESS, - NFPROTO_NETDEV, dev, NULL, NULL, + NFPROTO_NETDEV, NULL, dev, NULL, dev_net(dev), NULL); /* nf assumes rcu_read_lock, not just read_lock_bh */ |