diff options
| author | David S. Miller | 2017-06-15 17:31:37 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-06-15 17:59:32 +0200 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /drivers/net/wireless/intersil | |
| parent | rxrpc: Cache the congestion window setting (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.gz kernel-qcow2-linux-0ddead90b223faae475f3296a50bf574b7f7c69a.tar.xz kernel-qcow2-linux-0ddead90b223faae475f3296a50bf574b7f7c69a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intersil')
| -rw-r--r-- | drivers/net/wireless/intersil/hostap/hostap_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c index 544fc09dcb62..1372b20f931e 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_main.c +++ b/drivers/net/wireless/intersil/hostap/hostap_main.c @@ -73,7 +73,7 @@ struct net_device * hostap_add_interface(struct local_info *local, dev->mem_end = mdev->mem_end; hostap_setup_dev(dev, local, type); - dev->destructor = free_netdev; + dev->needs_free_netdev = true; sprintf(dev->name, "%s%s", prefix, name); if (!rtnl_locked) |