Merge pull request #171 from kimocoder/v5.2.20

Merge changes
This commit is contained in:
Christian B 2018-08-12 18:26:58 +02:00 committed by GitHub
commit 78055f23c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1352,7 +1352,7 @@ static u8 is_rtw_ndev(struct net_device *ndev)
static int rtw_ndev_notifier_call(struct notifier_block *nb, unsigned long state, void *ptr) static int rtw_ndev_notifier_call(struct notifier_block *nb, unsigned long state, void *ptr)
{ {
struct net_device *ndev; struct net_device *ndev;
_adapter *adapter = rtw_netdev_priv(ndev); _adapter *adapter;
if (ptr == NULL) if (ptr == NULL)
return NOTIFY_DONE; return NOTIFY_DONE;
@ -1366,6 +1366,8 @@ static int rtw_ndev_notifier_call(struct notifier_block *nb, unsigned long state
if (ndev == NULL) if (ndev == NULL)
return NOTIFY_DONE; return NOTIFY_DONE;
adapter = rtw_netdev_priv(ndev);
if (!is_rtw_ndev(ndev)) if (!is_rtw_ndev(ndev))
return NOTIFY_DONE; return NOTIFY_DONE;