linux.git/net/sched/act_simple.c, branch v4.2

sched: fix act file names in header comment

2014-11-06T20:04:41+00:00

Fixes: 4bba3925 ("[PKT_SCHED]: Prefix tc actions with act_")
Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

net_sched: act: move tcf_hashinfo_init() into tcf_register_action()

2014-02-13T00:23:32+00:00

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

net_sched: act: refactor cleanup ops

2014-02-13T00:23:32+00:00

For bindcnt and refcnt etc., they are common for all actions,
not need to repeat such operations for their own, they can be unified
now. Actions just need to do its specific cleanup if needed.

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

net_sched: act: hide struct tcf_common from API

2014-02-13T00:23:32+00:00

Now we can totally hide it from modules. tcf_hash_*() API's
will operate on struct tc_action, modules don't need to care about
the details.

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

net_sched: act: fetch hinfo from a->ops->hinfo

2014-01-21T22:43:16+00:00

Every action ops has a pointer to hash info, so we don't need to
hard-code it in each module.

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

net_sched: act: remove capab from struct tc_action_ops

2014-01-20T03:58:07+00:00

It is not actually implemented.

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

net_sched: act: move idx_gen into struct tcf_hashinfo

2014-01-13T19:50:14+00:00

There is no need to store the index separatedly
since tcf_hashinfo is allocated statically too.

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-01-06T22:37:45+00:00

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller

net_sched: act: Dont increment refcnt on replace

2013-12-27T17:50:00+00:00

 This is a bug fix. The existing code tries to kill many
 birds with one stone: Handling binding of actions to
 filters, new actions and replacing of action
 attributes. A simple test case to illustrate:

XXXX
 moja@fe1:~$ sudo tc actions add action drop index 12
 moja@fe1:~$ actions get action gact index 12
 action order 1: gact action drop
  random type none pass val 0
  index 12 ref 1 bind 0
 moja@fe1:~$ sudo tc actions replace action ok index 12
 moja@fe1:~$ actions get action gact index 12
 action order 1: gact action drop
  random type none pass val 0
  index 12 ref 2 bind 0
XXXX

The above shows the refcounf being wrongly incremented on replace.
There are more complex scenarios with binding of actions to filters
that i am leaving out that didnt work as well...

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

net_sched: fix a regression in tc actions

2013-12-20T22:06:27+00:00

This patch fixes:
1) pass mask rather than size to tcf_hashinfo_init()
2) the cleanup should be in reversed order in mirred_cleanup_module()

Reported-by: Eric Dumazet 
Fixes: 369ba56787d7469c0afd ("net_sched: init struct tcf_hashinfo at register time")
Cc: Eric Dumazet 
Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: Jamal Hadi Salim 
Signed-off-by: David S. Miller