This reverts commite991558189which is commit d8616ee2affcff37c5d315310da557a694a3303d upstream. It breaks the in-kernel API, and is not needed for the true bugfix to be backported properly (this was a dependent patch to make upstream changes easier), so it can be reverted. If it is deemed that this change is needed in the Android branch, it can be added back later in an ABI-safe way. Bug: 161946584 Fixes:e991558189("bpf, sockmap: Fix sk->sk_forward_alloc warn_on in sk_stream_kill_queues") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5db9531762c48519b4d4c98a0316e1fe467a8640
72 KiB
72 KiB