mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
68a7aec3f4b55caae63a77881dff2c07a2a8f883
rockchip-kernel/net/sched
History
Xin Long 68a7aec3f4 net: sched: allow act_ct to be built without NF_NAT 
[ Upstream commit 8427fd100c ]

In commit f11fe1dae1 ("net/sched: Make NET_ACT_CT depends on NF_NAT"),
it fixed the build failure when NF_NAT is m and NET_ACT_CT is y by
adding depends on NF_NAT for NET_ACT_CT. However, it would also cause
NET_ACT_CT cannot be built without NF_NAT, which is not expected. This
patch fixes it by changing to use "(!NF_NAT || NF_NAT)" as the depend.

Fixes: f11fe1dae1 ("net/sched: Make NET_ACT_CT depends on NF_NAT")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Link: https://lore.kernel.org/r/b6386f28d1ba34721795fb776a91cbdabb203447.1668807183.git.lucien.xin@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-12-02 17:40:01 +01:00
..
act_api.c
net/sched: act_api: Notify user space if any actions were flushed before error
2022-07-07 17:52:18 +02:00
act_bpf.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_connmark.c
netfilter: conntrack: Fix data-races around ct mark
2022-12-02 17:40:00 +01:00
act_csum.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_ct.c
netfilter: conntrack: Fix data-races around ct mark
2022-12-02 17:40:00 +01:00
act_ctinfo.c
netfilter: conntrack: Fix data-races around ct mark
2022-12-02 17:40:00 +01:00
act_gact.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_gate.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-10-05 18:40:01 -07:00
act_ife.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_ipt.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_meta_mark.c
…
act_meta_skbprio.c
…
act_meta_skbtcindex.c
…
act_mirred.c
net: sched: act_mirred: drop dst for the direction from egress to ingress
2021-11-26 10:39:16 +01:00
act_mpls.c
net/sched: act_mpls: ensure LSE is pullable before reading it
2020-12-03 11:13:37 -08:00
act_nat.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_pedit.c
net/sched: act_pedit: sanitize shift argument before usage
2022-05-25 09:17:58 +02:00
act_police.c
net/sched: act_police: more accurate MTU policing
2022-06-22 14:13:20 +02:00
act_sample.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_simple.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_skbedit.c
net_sched: defer tcf_idr_insert() in tcf_action_init_1()
2020-09-24 19:46:21 -07:00
act_skbmod.c
net/sched: act_skbmod: Skip non-Ethernet packets
2021-07-28 14:35:40 +02:00
act_tunnel_key.c
net/sched: act_tunnel_key: fix OOB write in case of IPv6 ERSPAN tunnels
2020-10-20 21:10:41 -07:00
act_vlan.c
net/sched: act_vlan: Fix modify to allow 0
2021-07-14 16:56:19 +02:00
cls_api.c
net: sched: fix possible refcount leak in tc_new_tfilter()
2022-09-28 11:10:37 +02:00
cls_basic.c
…
cls_bpf.c
…
cls_cgroup.c
…
cls_flow.c
Merge tag 'uninit-macro-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
2020-08-04 13:49:43 -07:00
cls_flower.c
net/sched: flower: fix parsing of ethertype following VLAN header
2022-04-20 09:23:11 +02:00
cls_fw.c
…
cls_matchall.c
net: qos offload add flow status with dropped count
2020-06-19 12:53:30 -07:00
cls_route.c
net_sched: cls_route: disallow handle of 0
2022-08-21 15:16:26 +02:00
cls_rsvp6.c
…
cls_rsvp.c
…
cls_rsvp.h
…
cls_tcindex.c
net: sched: fix memory leak in tcindex_partial_destroy_work
2021-07-28 14:35:38 +02:00
cls_u32.c
net/sched: cls_u32: fix possible leak in u32_init_knode()
2022-04-27 13:53:50 +02:00
em_canid.c
net: sched: kerneldoc fixes
2020-07-13 17:20:40 -07:00
em_cmp.c
…
em_ipset.c
sched: consistently handle layer3 header accesses in the presence of VLANs
2020-07-03 14:34:53 -07:00
em_ipt.c
sched: consistently handle layer3 header accesses in the presence of VLANs
2020-07-03 14:34:53 -07:00
em_meta.c
sched: consistently handle layer3 header accesses in the presence of VLANs
2020-07-03 14:34:53 -07:00
em_nbyte.c
…
em_text.c
…
em_u32.c
…
ematch.c
net: sched: kerneldoc fixes
2020-07-13 17:20:40 -07:00
Kconfig
net: sched: allow act_ct to be built without NF_NAT
2022-12-02 17:40:01 +01:00
Makefile
net: qos: introduce a gate control flow action
2020-05-01 16:08:19 -07:00
sch_api.c
net: sched: fix race condition in qdisc_graft()
2022-10-30 09:41:17 +01:00
sch_atm.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_blackhole.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_cake.c
net: sched: cake: fix null pointer access issue when cake_init() fails
2022-10-30 09:41:17 +01:00
sch_cbq.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_cbs.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_choke.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_codel.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_drr.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_dsmark.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_etf.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_ets.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_fifo.c
net_sched: fix NULL deref in fifo_set_limit()
2021-10-13 10:04:26 +02:00
sch_fq_codel.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_fq_pie.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_fq.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_generic.c
net/sched: fix netdevice reference leaks in attach_default_qdiscs()
2022-09-08 11:11:36 +02:00
sch_gred.c
net: sched: validate stab values
2021-03-30 14:31:57 +02:00
sch_hfsc.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_hhf.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_htb.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_ingress.c
…
sch_mq.c
net: sched: update default qdisc visibility after Tx queue cnt changes
2021-11-18 14:03:53 +01:00
sch_mqprio.c
net: sched: update default qdisc visibility after Tx queue cnt changes
2021-11-18 14:03:53 +01:00
sch_multiq.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_netem.c
net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms
2022-06-29 08:59:47 +02:00
sch_pie.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_plug.c
Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"
2020-07-16 16:48:34 -07:00
sch_prio.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_qfq.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_red.c
net: sched: Fix use after free in red_enqueue()
2022-11-10 18:14:18 +01:00
sch_sfb.c
net: sched: sfb: fix null pointer access issue when sfb_init() fails
2022-10-30 09:41:17 +01:00
sch_sfq.c
net: sched: validate stab values
2021-03-30 14:31:57 +02:00
sch_skbprio.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_taprio.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_tbf.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00
sch_teql.c
net: sched: delete duplicate cleanup of backlog and qlen
2022-10-30 09:41:17 +01:00