summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-06-08 19:06:29 +1000
committerDavid S. Miller <davem@davemloft.net>2017-06-08 10:13:28 -0400
commitcd1997f6c11483da819a7719aa013093b8003743 (patch)
tree5c3d2c8bf8b1bed25afc4281955a6ab1ed3a279a /drivers
parentcf124db566e6b036b8bcbe8decbed740bdfac8c6 (diff)
downloadlinux-stable-cd1997f6c11483da819a7719aa013093b8003743.tar.gz
linux-stable-cd1997f6c11483da819a7719aa013093b8003743.tar.bz2
linux-stable-cd1997f6c11483da819a7719aa013093b8003743.zip
net: s390: fix up for "Fix inconsistent teardown and release of private netdev state"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/net/netiucv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index dba94b486f05..fa732bd86729 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;