diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2017-09-05 09:50:39 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-06 16:52:02 +0200 |
| commit | e2b55245cfcb9a54fa7de357309a65205615f7d3 (patch) | |
| tree | 4cb6c8d37f1ca57e774a76af79018a1cfb0d2c74 /backport/backport-include/linux/netdevice.h | |
| parent | 97b8d7c49f441b45c532c3fac7f173430fcae66d (diff) | |
backport: fix netdev destructor backport for v4.11.9
The patch that changed the netdev destructor code was backported to
v4.11.9, so handle that in the backport.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/backport-include/linux/netdevice.h')
| -rw-r--r-- | backport/backport-include/linux/netdevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index d22eec2d..112bcf2b 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -320,7 +320,8 @@ static inline void netif_trans_update(struct net_device *dev) } #endif -#if LINUX_VERSION_IS_LESS(4,12,0) +#if LINUX_VERSION_IS_LESS(4,12,0) && \ + !LINUX_VERSION_IN_RANGE(4,11,9, 4,12,0) #define netdev_set_priv_destructor(_dev, _destructor) \ (_dev)->destructor = __ ## _destructor #define netdev_set_def_destructor(_dev) \ |