git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge tag 'v4.12-rc7' into drm-next
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
nlmon.c
diff --git
a/drivers/net/nlmon.c
b/drivers/net/nlmon.c
index b91603835d2680aa08911da7870ea176c5dd0792..c4b3362da4a2e33184b02dff0df3082b4d7e45e4 100644
(file)
--- a/
drivers/net/nlmon.c
+++ b/
drivers/net/nlmon.c
@@
-113,7
+113,7
@@
static void nlmon_setup(struct net_device *dev)
dev->netdev_ops = &nlmon_ops;
dev->ethtool_ops = &nlmon_ethtool_ops;
- dev->
destructor = free_netdev
;
+ dev->
needs_free_netdev = true
;
dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
NETIF_F_HIGHDMA | NETIF_F_LLTX;