MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 04:39:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "net/sched: unregister lockdep keys in qdisc_create/qdisc_alloc error path"

Browse Source 
This reverts commit a089369346 which is
commit 86735b57c9 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I05a576398d8ee04fd3fd19e23c1f6a41612baa8b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-07-01 10:48:36 +00:00
parent 47deb51546
commit b87a1e28af
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/sched/sch_api.c
View File

@ -1360,7 +1360,6 @@ err_out4:
ops->destroy(sch); ops->destroy(sch);
qdisc_put_stab(rtnl_dereference(sch->stab)); qdisc_put_stab(rtnl_dereference(sch->stab));
err_out3: err_out3:
lockdep_unregister_key(&sch->root_lock_key);
netdev_put(dev, &sch->dev_tracker); netdev_put(dev, &sch->dev_tracker);
qdisc_free(sch); qdisc_free(sch);
err_out2: err_out2:

1
net/sched/sch_generic.c
View File

@ -978,7 +978,6 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
return sch; return sch;
errout1: errout1:
lockdep_unregister_key(&sch->root_lock_key);
kfree(sch); kfree(sch);
errout: errout:
return ERR_PTR(err); return ERR_PTR(err);