These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / rtnetlink.h

diff --git a/kernel/include/linux/rtnetlink.h b/kernel/include/linux/rtnetlink.h
index 7b8e260..4be5048 100644 (file)
--- a/kernel/include/linux/rtnetlink.h
+++ b/kernel/include/linux/rtnetlink.h
@@ -33,11 +33,11 @@ extern wait_queue_head_t netdev_unregistering_wq;
 extern struct mutex net_mutex;
 
 #ifdef CONFIG_PROVE_LOCKING
-extern int lockdep_rtnl_is_held(void);
+extern bool lockdep_rtnl_is_held(void);
 #else
-static inline int lockdep_rtnl_is_held(void)
+static inline bool lockdep_rtnl_is_held(void)
 {
-       return 1;
+       return true;
 }
 #endif /* #ifdef CONFIG_PROVE_LOCKING */
 
@@ -79,17 +79,9 @@ static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)
 
 struct netdev_queue *dev_ingress_queue_create(struct net_device *dev);
 
-#ifdef CONFIG_NET_CLS_ACT
+#ifdef CONFIG_NET_INGRESS
 void net_inc_ingress_queue(void);
 void net_dec_ingress_queue(void);
-#else
-static inline void net_inc_ingress_queue(void)
-{
-}
-
-static inline void net_dec_ingress_queue(void)
-{
-}
 #endif
 
 extern void rtnetlink_init(void);
@@ -122,5 +114,9 @@ extern int ndo_dflt_fdb_del(struct ndmsg *ndm,
 
 extern int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
                                   struct net_device *dev, u16 mode,
-                                  u32 flags, u32 mask, int nlflags);
+                                  u32 flags, u32 mask, int nlflags,
+                                  u32 filter_mask,
+                                  int (*vlan_fill)(struct sk_buff *skb,
+                                                   struct net_device *dev,
+                                                   u32 filter_mask));
 #endif /* __LINUX_RTNETLINK_H */