Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / net / openvswitch / datapath.h

diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 8de9f7e20ae9ca157c6827a727e6c9e1fa96977d..3ece94563079fb154d437d75e90db23b055d6a0a 100644 (file)
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -149,7 +149,7 @@ int lockdep_ovsl_is_held(void);
 #define rcu_dereference_ovsl(p)                                        \
        rcu_dereference_check(p, lockdep_ovsl_is_held())
 
-static inline struct net *ovs_dp_get_net(struct datapath *dp)
+static inline struct net *ovs_dp_get_net(const struct datapath *dp)
 {
        return read_pnet(&dp->net);
 }
@@ -192,16 +192,16 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
                                         u8 cmd);
 
 int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
-                       struct sw_flow_actions *acts, struct sw_flow_key *);
+                       const struct sw_flow_actions *, struct sw_flow_key *);
 
 void ovs_dp_notify_wq(struct work_struct *work);
 
 int action_fifos_init(void);
 void action_fifos_exit(void);
 
-#define OVS_NLERR(fmt, ...)                                    \
+#define OVS_NLERR(logging_allowed, fmt, ...)                   \
 do {                                                           \
-       if (net_ratelimit())                                    \
-               pr_info("netlink: " fmt, ##__VA_ARGS__);        \
+       if (logging_allowed && net_ratelimit())                 \
+               pr_info("netlink: " fmt "\n", ##__VA_ARGS__);   \
 } while (0)
 #endif /* datapath.h */