linux-toradex.git/net/sched/act_ipt.c, branch v4.9.6

net_sched: move tc_action into tcf_common

2016-07-26T04:49:19+00:00

struct tc_action is confusing, currently we use it for two purposes:
1) Pass in arguments and carry out results from helper functions
2) A generic representation for tc actions

The first one is error-prone, since we need to make sure we don't
miss anything. This patch aims to get rid of this use, by moving
tc_action into tcf_common, so that they are allocated together
in hashtable and can be cast'ed easily.

And together with the following patch, we could really make
tc_action a generic representation for all tc actions and each
type of action can inherit from it.

Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-06-30T09:03:36+00:00

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller

net_sched: make tcf_hash_check() boolean

2016-06-15T19:43:35+00:00

Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

act_ipt: fix a bind refcnt leak

2016-06-15T19:31:35+00:00

And avoid calling tcf_hash_check() twice.

Fixes: a57f19d30b2d ("net sched: ipt action fix late binding")
Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

net_sched: remove internal use of TC_POLICE_*

2016-06-15T07:05:57+00:00

These should be gone when we removed CONFIG_NET_CLS_POLICE.
We can not totally remove them since they are exposed
to userspace.

Cc: Jamal Hadi Salim 
Signed-off-by: Cong Wang 
Acked-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

net sched: indentation and other OCD stylistic fixes

2016-06-07T22:53:54+00:00

Signed-off-by: Jamal Hadi Salim 
Acked-by: Cong Wang

net sched actions: aggregate dumping of actions timeinfo

2016-06-07T22:53:43+00:00

Signed-off-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

net sched actions: introduce timestamp for firsttime use

2016-06-07T22:53:43+00:00

Useful to know when the action was first used for accounting
(and debugging)

Signed-off-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

net sched: actions use tcf_lastuse_update for consistency

2016-06-07T22:53:43+00:00

Signed-off-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-05-15T17:32:48+00:00

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller