This patchset aims to clean up and fixes some bugs in current merge window, this is why it is targeting -net.
Patch 1-5 are clean up Vlad's patches merged in current merge window, patch 6 is just a trivial cleanup. Patch 7 reverts a lockdep warning fix and patch 8 provides a better fix for it. Patch 9 fixes a potential deadlock found by me during code review. Please see each patch for details. Cc: Jamal Hadi Salim <j...@mojatatu.com> Signed-off-by: Cong Wang <xiyou.wangc...@gmail.com> Cong Wang (9): net_sched: improve and refactor tcf_action_put_many() net_sched: remove unnecessary ops->delete() net_sched: remove unused parameter for tcf_action_delete() net_sched: remove unused tcf_idr_check() net_sched: remove list_head from tc_action net_sched: remove unused tcfa_capab Revert "net: sched: act_ife: disable bh when taking ife_mod_lock" act_ife: move tcfa_lock down to where necessary act_ife: fix a potential deadlock drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 6 +- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 10 +-- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 5 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 +++-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 3 +- .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 6 +- drivers/net/ethernet/netronome/nfp/flower/action.c | 6 +- drivers/net/ethernet/qlogic/qede/qede_filter.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 5 +- include/net/act_api.h | 7 -- include/net/pkt_cls.h | 25 +++--- net/dsa/slave.c | 4 +- net/sched/act_api.c | 70 ++++++---------- net/sched/act_bpf.c | 8 -- net/sched/act_connmark.c | 8 -- net/sched/act_csum.c | 8 -- net/sched/act_gact.c | 8 -- net/sched/act_ife.c | 92 ++++++++++------------ net/sched/act_ipt.c | 16 ---- net/sched/act_mirred.c | 8 -- net/sched/act_nat.c | 8 -- net/sched/act_pedit.c | 8 -- net/sched/act_police.c | 8 -- net/sched/act_sample.c | 8 -- net/sched/act_simple.c | 8 -- net/sched/act_skbedit.c | 8 -- net/sched/act_skbmod.c | 8 -- net/sched/act_tunnel_key.c | 8 -- net/sched/act_vlan.c | 8 -- 30 files changed, 108 insertions(+), 290 deletions(-) -- 2.14.4
