Merge pull request #424 from u-ra/v5.6.4.1

Fix oops on interface rename
This commit is contained in:
Christian Bremvåg 2019-09-28 21:33:58 +00:00 committed by GitHub
commit 547d44bb9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1404,7 +1404,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)
{
struct net_device *ndev;
_adapter *adapter = rtw_netdev_priv(ndev);
_adapter *adapter;
if (ptr == NULL)
return NOTIFY_DONE;
@ -1423,6 +1423,8 @@ static int rtw_ndev_notifier_call(struct notifier_block *nb, unsigned long state
RTW_INFO(FUNC_NDEV_FMT" state:%lu\n", FUNC_NDEV_ARG(ndev), state);
adapter = rtw_netdev_priv(ndev);
switch (state) {
case NETDEV_CHANGENAME:
//rtw_adapter_proc_replace(ndev);