diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-08 19:06:29 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-05 14:41:34 +0200 |
| commit | 64603b75f8f625437866b896bbad466459dcf7ed (patch) | |
| tree | e0921769ec2785173ce89a5647fb2f95e7bc2325 /drivers | |
| parent | 95876855a55072572895a236b156ffb357fd5538 (diff) | |
net: s390: fix up for "Fix inconsistent teardown and release of private netdev state"
[ Upstream commit cd1997f6c11483da819a7719aa013093b8003743 ]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/net/netiucv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 3f85b97ab8d2..6d3494ba84cf 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -1954,7 +1954,6 @@ static void netiucv_free_netdevice(struct net_device *dev) privptr->conn = NULL; privptr->fsm = NULL; /* privptr gets freed by free_netdev() */ } - free_netdev(dev); } /** @@ -1972,7 +1971,8 @@ static void netiucv_setup_netdevice(struct net_device *dev) dev->mtu = NETIUCV_MTU_DEFAULT; dev->min_mtu = 576; dev->max_mtu = NETIUCV_MTU_MAX; - dev->destructor = netiucv_free_netdevice; + dev->needs_free_netdev = true; + dev->priv_destructor = netiucv_free_netdevice; dev->hard_header_len = NETIUCV_HDRLEN; dev->addr_len = 0; dev->type = ARPHRD_SLIP; |