]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: revert "net_sched: move tp->root allocation into fw_init()"
authorWANG Cong <xiyou.wangcong@gmail.com>
Wed, 23 Sep 2015 00:01:11 +0000 (17:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Oct 2015 11:51:38 +0000 (13:51 +0200)
commitd8abd0589da3bc4fabe1450a5e98099b28874a30
tree3debf2c87dc1a768d652ddf1b5879e2667b553dd
parentdd9eb1b17ca8fdbcfa496b61a7a5a2a34445a3da
net: revert "net_sched: move tp->root allocation into fw_init()"

[ Upstream commit d8aecb10115497f6cdf841df8c88ebb3ba25fa28 ]

fw filter uses tp->root==NULL to check if it is the old method,
so it doesn't need allocation at all in this case. This patch
reverts the offending commit and adds some comments for old
method to make it obvious.

Fixes: 33f8b9ecdb15 ("net_sched: move tp->root allocation into fw_init()")
Reported-by: Akshat Kakkar <akshat.1984@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sched/cls_fw.c