Daniel Borkmann 62da98656b netfilter: nf_conntrack: make nf_ct_zone_dflt built-in ... Fengguang reported, that some randconfig generated the following linker issue with nf_ct_zone_dflt object involved: [...] CC init/version.o LD init/built-in.o net/built-in.o: In function `ipv4_conntrack_defrag': nf_defrag_ipv4.c:(.text+0x93e95): undefined reference to `nf_ct_zone_dflt' net/built-in.o: In function `ipv6_defrag': nf_defrag_ipv6_hooks.c:(.text+0xe3ffe): undefined reference to `nf_ct_zone_dflt' make: *** [vmlinux] Error 1 Given that configurations exist where we have a built-in part, which is accessing nf_ct_zone_dflt such as the two handlers nf_ct_defrag_user() and nf_ct6_defrag_user(), and a part that configures nf_conntrack as a module, we must move nf_ct_zone_dflt into a fixed, guaranteed built-in area when netfilter is configured in general. Therefore, split the more generic parts into a common header under include/linux/netfilter/ and move nf_ct_zone_dflt into the built-in section that already holds parts related to CONFIG_NF_CONNTRACK in the netfilter core. This fixes the issue on my side. Fixes: 308ac9143e ("netfilter: nf_conntrack: push zone object into functions") Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: David S. Miller <davem@davemloft.net>		2015-09-02 16:32:56 -07:00
..
9p	9p: switch p9_client_read() to passing struct iov_iter *	2015-04-11 22:28:27 -04:00
bluetooth	Bluetooth: add hci_connect_le_scan	2015-08-10 21:36:13 +02:00
caif
irda
iucv
netfilter	netfilter: nf_conntrack: make nf_ct_zone_dflt built-in	2015-09-02 16:32:56 -07:00
netns	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-08-04 23:57:45 -07:00
nfc	nfc: netlink: Add capability to reply to vendor_cmd with data	2015-08-20 22:00:11 +02:00
phonet
sctp	sctp: fix ASCONF list handling	2015-06-14 12:55:49 -07:00
tc_act	net_sched: act_bpf: remove spinlock in fast path	2015-08-26 11:01:45 -07:00
6lowpan.h	6lowpan: add generic 6lowpan netdev private data	2015-08-11 22:05:36 +02:00
act_api.h	net_sched: make tcf_hash_destroy() static	2015-08-26 11:01:44 -07:00
addrconf.h	ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument	2015-07-31 15:21:30 -07:00
af_ieee802154.h
af_rxrpc.h
af_unix.h	net/unix: support SCM_SECURITY for stream sockets	2015-06-10 22:49:20 -07:00
af_vsock.h	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
ah.h
arp.h	neigh: Factor out ___neigh_lookup_noref	2015-03-04 00:23:23 -05:00
atmclip.h
ax25.h	ax25: Stop using sock->sk_protinfo.	2015-06-28 16:55:44 -07:00
ax88796.h
bond_3ad.h
bond_alb.h
bond_options.h	bonding: convert num_grat_arp to the new bonding option API	2015-07-27 01:05:24 -07:00
bonding.h	bonding: Implement user key part of port_key in an AD system.	2015-05-11 10:59:32 -04:00
busy_poll.h
cfg80211-wext.h
cfg80211.h	Merge branch 'mac80211' into mac80211-next	2015-07-17 15:39:41 +02:00
cfg802154.h	ieee802154: add ack request default handling	2015-08-10 20:43:06 +02:00
checksum.h	net: Add inet_proto_csum_replace_by_diff utility function	2015-08-17 21:33:06 -07:00
cipso_ipv4.h
cls_cgroup.h	cls_cgroup: factor out classid retrieval	2015-07-20 12:41:30 -07:00
codel.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
compat.h	net: switch importing msghdr from userland to {compat_,}import_iovec()	2015-04-09 00:02:26 -04:00
datalink.h
dcbevent.h
dcbnl.h	net/dcb: Add IEEE QCN attribute	2015-03-06 21:50:02 -05:00
dn.h
dn_dev.h
dn_fib.h
dn_neigh.h	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
dn_nsp.h
dn_route.h
dsa.h	net: dsa: Add dsa_is_dsa_port() helper	2015-08-18 14:17:21 -07:00
dsfield.h
dst.h	tcp: use dctcp if enabled on the route to the initiator	2015-08-31 12:34:00 -07:00
dst_metadata.h	tun_dst: Remove opts_size	2015-08-31 21:23:42 -07:00
dst_ops.h	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
esp.h
ethoc.h
fib_rules.h	fib: Add fib rule match on tunnel id	2015-07-21 10:39:06 -07:00
firewire.h
flow.h	flow_dissector: Use 'const' where possible.	2015-09-01 21:19:17 -07:00
flow_dissector.h	flow_dissector: Don't use bit fields.	2015-09-01 16:46:08 -07:00
flowcache.h
fou.h
garp.h
gen_stats.h
genetlink.h	net: Introduce possible_net_t	2015-03-12 14:39:40 -04:00
geneve.h	geneve: Consolidate Geneve functionality in single module.	2015-08-27 15:42:48 -07:00
gre.h	gre: Remove support for sharing GRE protocol hook.	2015-08-10 14:03:54 -07:00
gro_cells.h	gro_cells: remove spinlock protecting receive queues	2015-08-31 15:17:17 -07:00
gue.h
icmp.h
ieee80211_radiotap.h
ieee802154_netdev.h	mac802154: cleanup llsec param flags	2015-06-12 11:42:29 +02:00
if_inet6.h	ipv6: do retries on stable privacy addresses	2015-03-23 22:12:09 -04:00
inet6_connection_sock.h	inet: get rid of central tcp/dccp listener timer	2015-03-20 12:40:25 -04:00
inet6_hashtables.h	ipv6: get rid of __inet6_hash()	2015-03-18 22:00:35 -04:00
inet_common.h	net: Modify sk_alloc to not reference count the netns of kernel sockets.	2015-05-11 10:50:18 -04:00
inet_connection_sock.h	tcp: fix child sockets to use system default congestion control if not set	2015-05-31 21:49:14 -07:00
inet_ecn.h
inet_frag.h	inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test	2015-07-26 21:00:15 -07:00
inet_hashtables.h	inet: simplify timewait refcounting	2015-07-09 15:12:20 -07:00
inet_sock.h	inet: add IP_BIND_ADDRESS_NO_PORT to overcome bind(0) limitations	2015-06-06 23:57:12 -07:00
inet_timewait_sock.h	inet: inet_twsk_deschedule factorization	2015-07-09 15:12:20 -07:00
inetpeer.h	net: Add support for VRFs to inetpeer cache	2015-08-28 13:32:36 -07:00
ip.h	net: Introduce helper functions to get the per cpu data	2015-08-30 21:48:58 -07:00
ip6_checksum.h
ip6_fib.h	route: move lwtunnel state to dst_entry	2015-08-20 15:42:36 -07:00
ip6_route.h	ipv6: Add rt6_get_cookie() function	2015-05-25 13:25:34 -04:00
ip6_tunnel.h	udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().	2015-04-07 15:29:08 -04:00
ip_fib.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
ip_tunnels.h	ip-tunnel: Use API to access tunnel metadata options.	2015-08-31 12:28:56 -07:00
ip_vs.h	ipvs: add more mcast parameters for the sync daemon	2015-08-21 09:10:11 -07:00
ipcomp.h
ipconfig.h
ipv6.h	ipv6: Enable auto flow labels by default	2015-07-31 17:07:12 -07:00
ipx.h
iw_handler.h
lapb.h
lib80211.h
llc.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
lwtunnel.h	lwt: Add cfg argument to build_state	2015-08-24 10:34:40 -07:00
mac80211.h	mac80211: remove ieee80211_aes_cmac_calculate_k1_k2()	2015-08-13 11:31:45 +02:00
mac802154.h	mac802154: do not export ieee802154_rx()	2015-07-23 17:10:50 +02:00
mip6.h
mld.h
mpls.h
mpls_iptunnel.h	mpls: ip tunnel support	2015-07-21 10:39:05 -07:00
mrp.h
ndisc.h	ipv6: ndisc: inherit metadata dst when creating ndisc requests	2015-08-20 15:42:37 -07:00
neighbour.h	net: add explicit logging and stat for neighbour table overflow	2015-08-10 13:46:21 -07:00
net_namespace.h	netfilter: nfacct: per network namespace support	2015-08-07 11:50:56 +02:00
net_ratelimit.h
netevent.h
netlabel.h
netlink.h	netlink: implement nla_get_in_addr and nla_get_in6_addr	2015-03-31 13:58:35 -04:00
netprio_cgroup.h
netrom.h
nexthop.h
nl802154.h	ieee802154: add ack request default handling	2015-08-10 20:43:06 +02:00
p8022.h
ping.h	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
pkt_cls.h
pkt_sched.h	net: sched: consolidate tc_classify{,_compat}	2015-08-27 14:18:48 -07:00
protocol.h
psnap.h
raw.h
rawv6.h
red.h
regulatory.h
request_sock.h	tcp: provide SYN headers for passive connections	2015-05-05 16:02:34 -04:00
rose.h
route.h	net: Make table id type u32	2015-09-01 14:32:44 -07:00
rtnetlink.h	openvswitch: Use regular VXLAN net_device device	2015-07-21 10:39:07 -07:00
sch_generic.h	net: sched: register noqueue qdisc	2015-08-27 17:14:30 -07:00
scm.h
secure_seq.h
slhc_vj.h
snmp.h
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
Space.h
stp.h
switchdev.h	net: switchdev: support static FDB addresses	2015-08-11 12:03:19 -07:00
tcp.h	tcp: use dctcp if enabled on the route to the initiator	2015-08-31 12:34:00 -07:00
tcp_memcontrol.h
tcp_states.h	inet: add TCP_NEW_SYN_RECV state	2015-03-12 22:58:12 -04:00
timewait_sock.h	inet: remove BUG_ON() in twsk_destructor()	2015-07-09 15:12:20 -07:00
transp_v6.h
tso.h
udp.h	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
udp_tunnel.h	vxlan: do not receive IPv4 packets on IPv6 socket	2015-08-29 13:07:54 -07:00
udplite.h
vrf.h	net: Make table id type u32	2015-09-01 14:32:44 -07:00
vsock_addr.h
vxlan.h	vxlan: fix multiple inclusion of vxlan.h	2015-08-25 14:32:04 -07:00
wext.h
wimax.h
x25.h
x25device.h
xfrm.h	xfrm: Add oif to dst lookups	2015-08-11 12:41:35 +02:00