aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2015-12-03 21:12:30 +0100
committerDavid S. Miller <davem@davemloft.net>2015-12-05 17:41:41 -0500
commitff3516442768f0babe7ea2db62e34aee1d76e969 (patch)
tree23336a0f75b206749b712905cf3198b9867a1fdc /drivers/net/wan
parentMerge branch 'qmi_wwan_MDM9x30' (diff)
downloadlinux-dev-ff3516442768f0babe7ea2db62e34aee1d76e969.tar.xz
linux-dev-ff3516442768f0babe7ea2db62e34aee1d76e969.zip
WAN: HDLC: Detach protocol before unregistering device
The current code first unregisters the device, and then detaches the protocol from it. This should be performed the other way around, since the detach may try to use state which has been freed by the unregister. Swap the order, so that we first detach and then remove the netdev. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/hdlc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 51f6cee8aab2..2a6595b4ae15 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -266,8 +266,8 @@ struct net_device *alloc_hdlcdev(void *priv)
void unregister_hdlc_device(struct net_device *dev)
{
rtnl_lock();
- unregister_netdevice(dev);
detach_hdlc_protocol(dev);
+ unregister_netdevice(dev);
rtnl_unlock();
}