diff options
| author | Greg Kroah-Hartman | 2017-06-20 04:17:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-06-20 04:17:45 +0200 |
| commit | d06838de4a015c7c4844ad3fcf63ad5e2c17b234 (patch) | |
| tree | ac8c5fa24458e7c6d33ceef89260a955a6ccaac8 /drivers/staging/rtl8188eu/os_dep | |
| parent | staging: android: ion: Improve memory alloc style (diff) | |
| parent | Linux 4.12-rc6 (diff) | |
| download | kernel-qcow2-linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.tar.gz kernel-qcow2-linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.tar.xz kernel-qcow2-linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.zip | |
Merge 4.12-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep')
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/mon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c index ed396619d97a..7326d9b0fa7f 100644 --- a/drivers/staging/rtl8188eu/os_dep/mon.c +++ b/drivers/staging/rtl8188eu/os_dep/mon.c @@ -176,7 +176,7 @@ static const struct net_device_ops mon_netdev_ops = { static void mon_setup(struct net_device *dev) { dev->netdev_ops = &mon_netdev_ops; - dev->destructor = free_netdev; + dev->needs_free_netdev = true; ether_setup(dev); dev->priv_flags |= IFF_NO_QUEUE; dev->type = ARPHRD_IEEE80211; |