Merge remote-tracking branch 'ovs-dev/master'

[sliver-openvswitch.git] / datapath / linux / compat / include / linux / netdevice.h

diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
index ba1fc59..3f66d3a 100644 (file)
--- a/datapath/linux/compat/include/linux/netdevice.h
+++ b/datapath/linux/compat/include/linux/netdevice.h
@@ -188,4 +188,19 @@ static inline struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
        return skb_gso_segment(skb, features);
 }
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
+static inline int netdev_master_upper_dev_link(struct net_device *dev,
+                                              struct net_device *upper_dev)
+{
+       return netdev_set_master(dev, upper_dev);
+}
+
+static inline void netdev_upper_dev_unlink(struct net_device *dev,
+                                          struct net_device *upper_dev)
+{
+       netdev_set_master(dev, NULL);
+}
+#endif
+
 #endif