datapath: Get rid of compat.h, compat26.h in favor of modern approach.

[openvswitch] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index 32053f01f0c46ff96eff876b4e35c77601dafc11..5e16143ca402f7da0ee8fc18ee5eb16c3b7598e6 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -137,7 +137,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                 * groups configured). */
                if (skb_is_gso(skb)) {
                        const struct nlattr *actions_left;
-                       u32 actions_len_left;
+                       int actions_len_left;
                        struct sk_buff *segs;
 
                        segs = skb_gso_segment(skb, 0);
@@ -360,7 +360,7 @@ error:
        kfree_skb(skb);
 }
 
-static int output_control(struct datapath *dp, struct sk_buff *skb, u32 arg)
+static int output_control(struct datapath *dp, struct sk_buff *skb, u64 arg)
 {
        skb = skb_clone(skb, GFP_ATOMIC);
        if (!skb)