datapath: Use min() instead of open-coding it.

[openvswitch] / datapath / actions.h

diff --git a/datapath/actions.h b/datapath/actions.h
index 9dfca36594d6738f483604ef99cf8c9ffa61b468..e4fc397494545ed125b764b9dad0c9fdb67b4f07 100644 (file)
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -18,12 +18,12 @@ struct odp_flow_key;
 union odp_action;
 
 int execute_actions(struct datapath *dp, struct sk_buff *skb,
-                   struct odp_flow_key *key,
+                   const struct odp_flow_key *key,
                    const union odp_action *, int n_actions,
                    gfp_t gfp);
 
-static inline void
-set_skb_csum_bits(const struct sk_buff *old_skb, struct sk_buff *new_skb)
+static inline void set_skb_csum_bits(const struct sk_buff *old_skb,
+                                    struct sk_buff *new_skb)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        /* Before 2.6.24 these fields were not copied when