Merge branch 'net_sched-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Oct 2014 22:02:40 +0000 (18:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Oct 2014 22:02:40 +0000 (18:02 -0400)
commite91a159ef58ebcf2155332dc395c6a29dca86051
tree2bf659bf5d527447c11845ca06d15d1b69b9ab31
parentfcbeb976d7ce783fd58e63e61c196d9a8912b3be
parent18cdb37ebf4c986d9502405cbd16b0ac29770c25
Merge branch 'net_sched-next'

John Fastabend says:

====================
net sched rcu updates

This fixes the use of tcf_proto from RCU callbacks it requires
moving the unbind calls out of the callbacks and removing the
tcf_proto argument from the tcf_em_tree_destroy().

This is a rework of two previous series and addresses comments
from Cong. And should apply against latest net-next.

The previous series links below for reference:

(1/2) net: sched: do not use tcf_proto 'tp' argument from call_rcu
http://patchwork.ozlabs.org/patch/396149/

(2/2) net: sched: replace ematch calls to use struct net
http://patchwork.ozlabs.org/patch/396150/

net: sched: cls_cgroup tear down exts and ematch from rcu callback
http://patchwork.ozlabs.org/patch/396307/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>