diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-04 23:57:14 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 09:19:32 +0100 |
| commit | 63bb0c5821ca4732f6e6db3d6fd606461a321c9e (patch) | |
| tree | dfdcd66b71840d3dcccb47166db023478e6fc013 /backport/backport-include/linux/netdevice.h | |
| parent | e78242ef93ae35403f2b5eba9bf0a985731d5059 (diff) | |
header: netdevice.h: Fix netdev_upper_dev_link on 4.14
Commit 42ab19ee90292 ("net: Add extack to upper device linking") which
added an extra parameter to netdev_upper_dev_link() was added with
kernel 4.15 and was not backported to kernel 4.14, activate this
backport already for kernel 4.14.
Fixes: 8cdd85766293 ("backports: add netdev_upper_dev_link() extack argument")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index d92c95ad..8723f8c5 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -334,7 +334,7 @@ static inline void netif_trans_update(struct net_device *dev) (_dev)->needs_free_netdev = true; #endif -#if LINUX_VERSION_IS_LESS(4,14,0) +#if LINUX_VERSION_IS_LESS(4,15,0) static inline int _bp_netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev) { |