From: David S. Miller <davem@davemloft.net>
Date: Wed, 28 Aug 2019 23:02:32 +0000 (-0700)
Subject: Merge branch 'r8152-fix-side-effect'
X-Git-Tag: v5.3-rc7~3^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80a6a5d62da9ec1a4a949c0f95baa80d7efbfef5;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'r8152-fix-side-effect'

Hayes Wang says:

====================
r8152: fix side effect

v3:
Update the commit message for patch #1.

v2:
Replace patch #2 with "r8152: remove calling netif_napi_del".

v1:
The commit 0ee1f4734967 ("r8152: napi hangup fix after disconnect")
add a check to avoid using napi_disable after netif_napi_del. However,
the commit ffa9fec30ca0 ("r8152: set RTL8152_UNPLUG only for real
disconnection") let the check useless.

Therefore, I revert commit 0ee1f4734967 ("r8152: napi hangup fix
after disconnect") first, and add another patch to fix it.
====================

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

80a6a5d62da9ec1a4a949c0f95baa80d7efbfef5