diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2020-10-13 20:02:54 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-13 20:02:54 -0700 |
| commit | 1e40d75ef90c5c99d9418637cd7295fa49ecb5fb (patch) | |
| tree | d3878281eb6abeabc2d5993985fb688eef3579e5 /include | |
| parent | ip_gre: set dev->hard_header_len and dev->needed_headroom properly (diff) | |
| parent | netfilter: nf_log: missing vlan offload tag and proto (diff) | |
| download | wireguard-linux-1e40d75ef90c5c99d9418637cd7295fa49ecb5fb.tar.xz wireguard-linux-1e40d75ef90c5c99d9418637cd7295fa49ecb5fb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Extend nf_queue selftest to cover re-queueing, non-gso mode and
delayed queueing, from Florian Westphal.
2) Clear skb->tstamp in IPVS forwarding path, from Julian Anastasov.
3) Provide netlink extended error reporting for EEXIST case.
4) Missing VLAN offload tag and proto in log target.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_log.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h index 0d3920896d50..716db4a0fed8 100644 --- a/include/net/netfilter/nf_log.h +++ b/include/net/netfilter/nf_log.h @@ -108,6 +108,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb, unsigned int logflags); void nf_log_dump_sk_uid_gid(struct net *net, struct nf_log_buf *m, struct sock *sk); +void nf_log_dump_vlan(struct nf_log_buf *m, const struct sk_buff *skb); void nf_log_dump_packet_common(struct nf_log_buf *m, u_int8_t pf, unsigned int hooknum, const struct sk_buff *skb, const struct net_device *in, |