header: netdevice.h: Fix netdev_upper_dev_link on 4.14
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 4 Mar 2018 22:57:14 +0000 (23:57 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 21 Mar 2018 08:19:32 +0000 (09:19 +0100)
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>
backport/backport-include/linux/netdevice.h

index d92c95ad479349921ddab81aa7264722ce15043e..8723f8c58e8451074965ef74911459d28c88066a 100644 (file)
@@ -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)
 {