Florian Westphal
1cd472bf03
netfilter: nf_nat: add nat hook register functions to nf_nat ...
This adds the infrastructure to register nat hooks with the nat core
instead of the netfilter core.
nat hooks are used to configure nat bindings. Such hooks are registered
from ip(6)table_nat or by the nftables core when a nat chain is added.
After next patch, nat hooks will be registered with nf_nat instead of
netfilter core. This allows to use many nat lookup functions at the
same time while doing the real packet rewrite (nat transformation) in
one place.
This change doesn't convert the intended users yet to ease review.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2018-05-23 09:14:05 +02:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2018-04-08 17:19:15 -04:00
caif: reduce stack size with KASAN
2018-01-19 14:02:12 -05:00
net: annotate ->poll() instances
2017-11-27 16:20:04 -05:00
netfilter: nf_nat: add nat hook register functions to nf_nat
2018-05-23 09:14:05 +02:00
ipv6: sr: Compute flowlabel for outer IPv6 header of seg6 encap mode
2018-04-25 13:02:15 -04:00
net: phonet: mark phonet_protocol as const
2017-10-07 23:15:08 +01:00
sctp: allow sctp_init_cause to return errors
2018-05-01 12:09:35 -04:00
net/sched: act_csum: don't use spinlock in the fast path
2018-01-23 19:51:46 -05:00
net/sched: remove tcf_idr_cleanup()
2018-03-23 21:52:19 -04:00
ipv6: Count interface receive statistics on the ingress netdev
2018-04-17 13:39:51 -04:00
rxrpc, afs: Use debug_ids rather than pointers in traces
2018-03-27 23:03:00 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
VSOCK: use TCP state constants for sk_state
2017-10-05 18:44:17 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
2018-01-15 14:53:43 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: Make ax25_ptr depend on CONFIG_AX25
2018-02-14 11:55:33 -05:00
net-next: ax88796: add interrupt status callback to platform data
2018-04-19 16:11:11 -04:00
bonding: send learning packets for vlans on slave
2018-05-11 11:50:41 -04:00
net: fix compilation when busy poll is not enabled
2017-08-11 14:59:24 -07:00
nl80211: Add control_port_over_nl80211 to mesh_setup
2018-03-29 14:01:27 +02:00
net: remove compat_sys_*() prototypes from net/compat.h
2018-04-02 20:16:17 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
devlink: convert occ_get op to separate registration
2018-04-08 12:45:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/decnet: Convert timers to use timer_setup()
2017-10-18 12:39:36 +01:00
decnet: Move dn_next into decnet route structure.
2017-11-30 09:54:25 -05:00
net: dsa: Plug in PHYLINK support
2018-05-11 12:03:06 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: core: dst: Add kernel-doc for 'net' parameter
2018-03-05 12:52:45 -05:00
net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-05 12:52:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: erspan: fix metadata extraction
2018-02-06 11:32:48 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
inet: whitespace cleanup
2018-02-28 11:43:28 -05:00
net: Add extack to fib_notifier_info
2017-11-01 11:50:43 +09:00
net: fib_rules: add extack support
2018-04-23 10:21:24 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: Remove unused get_hash_from_flow functions
2018-03-04 13:04:23 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-11 20:53:22 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fq: support filtering a given tin
2017-10-11 09:49:34 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-30 21:09:24 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mq
2017-12-08 13:32:26 -05:00
genetlink: fix genlmsg_nlhdr()
2017-11-16 10:49:00 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: GRE: Add is_gretap_dev, is_ip6gretap_dev
2018-02-27 14:46:26 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fou: fix some member types in guehdr
2017-12-11 14:10:06 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mac80211: support reporting A-MPDU EOF bit value/known
2018-02-22 21:13:02 +01:00
net/ipv6: Remove aca_idev
2018-04-19 15:40:13 -04:00
net: sched: ife: handle malformed tlv length
2018-04-22 21:12:00 -04:00
net: ipv6: add second dif to inet6 socket lookups
2017-08-07 11:39:22 -07:00
net: Introduce __inet_bind() and __inet6_bind
2018-03-31 02:15:43 +02:00
net: ipv4: remove define INET_CSK_DEBUG and unnecessary EXPORT_SYMBOL
2018-05-10 17:43:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
inet: frags: reorganize struct netns_frags
2018-03-31 23:25:39 -04:00
inet: Add a 2nd listener hashtable (port+addr)
2017-12-03 10:18:28 -05:00
udp: generate gso with UDP_SEGMENT
2018-04-26 15:08:04 -04:00
tcp: Add mark for TIMEWAIT sockets
2018-05-10 17:44:52 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
udp: generate gso with UDP_SEGMENT
2018-04-26 15:08:04 -04:00
net/ipv6: rename rt6_next to fib6_next
2018-05-04 19:54:52 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
ip6_gre: add erspan v2 support
2017-12-15 12:34:00 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
net/ipv4: Update ip_tunnel_metadata_cnt static key to modern api
2018-05-10 15:13:33 -04:00
netfilter: ipvs: Keep latest weight of destination
2018-04-09 10:10:55 +03:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: Spelling s/stucture/structure/
2018-03-27 09:51:23 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: LLC: Convert timers to use timer_setup()
2017-10-25 12:06:25 +09:00
llc: delete timers synchronously in llc_sk_free()
2018-04-22 14:55:03 -04:00
net: Move ipv4 set_lwt_redirect helper to lwtunnel
2018-02-14 14:43:32 -05:00
mac80211: fix kernel-doc "bad line" warning
2018-05-07 15:01:52 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
neighbour: support for NTF_EXT_LEARNED flag
2018-04-25 13:19:59 -04:00
net: Introduce net_rwsem to protect net_namespace_list
2018-03-29 13:47:53 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/ipv6: Add support for path selection using hash of 5-tuple
2018-03-04 13:04:23 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: fix rtnh_ok()
2018-04-07 22:32:31 -04:00
openvswitch: enable NSH support
2017-11-08 16:12:33 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xdp: allow page_pool as an allocator type in xdp_return_frame
2018-04-17 10:50:29 -04:00
net: sch: prio: Add offload ability for grafting a child
2018-02-28 12:06:01 -05:00
net: remove prototype of qdisc_lookup_class()
2018-01-16 14:56:54 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
IPv4: early demux can return an error code
2017-10-01 03:55:47 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: ipv4: add second dif to raw socket lookups
2017-08-07 11:39:21 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net_sched: red: Avoid illegal values
2017-12-05 14:37:13 -05:00
cfg80211: read wmm rules from regulatory database
2018-03-29 11:11:40 +02:00
tcp: socket option to set TCP fast open key
2017-10-20 13:21:36 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
Bluetooth: btrsi: add new rsi bluetooth driver
2018-03-13 18:37:02 +02:00
rtnetlink: remove __rtnl_register
2017-12-04 11:32:53 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ipv6: sr: add support for ip4ip6 encapsulation
2017-08-25 17:10:23 -07:00
slip: Check if rstate is initialized before uncompressing
2018-04-11 10:33:46 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/sock: Update memalloc_socks static key to modern api
2018-05-10 15:13:34 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/mac89x0: Convert to platform_driver
2018-03-01 21:21:36 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
strparser: Use delayed work instead of timer for msg timeout
2017-10-25 10:37:11 +09:00
switchdev: Add fdb.added_by_user to switchdev notifications
2018-05-03 13:46:47 -04:00
tcp: switch pacing timer to softirq based hrtimer
2018-05-11 12:24:37 -04:00
tcp: remove the hardcode in the definition of TCPF Macro
2018-02-21 15:06:05 -05:00
flow_dissector: do not rely on implicit casts
2018-05-08 00:02:41 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-04 09:58:56 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
vxlan: factor out VXLAN-GPE next protocol
2017-08-29 15:16:52 -07:00
udp: Do not pass checksum as a parameter to GSO segmentation
2018-05-08 22:30:06 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
udplite: fix partial checksum initialization
2018-02-16 15:57:42 -05:00
vxlan: add ttl inherit support
2018-04-17 13:53:13 -04:00
lift handling of SIOCIW... out of dev_ioctl()
2018-01-24 19:13:45 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xsk: add Rx receive functions and poll support
2018-05-03 15:55:24 -07:00
xsk: add Tx queue setup and mmap support
2018-05-03 15:55:24 -07:00
xfrm: Fix warning in xfrm6_tunnel_net_exit.
2018-04-16 07:50:09 +02:00
1cd472bf03