datapath: Correct byte order annotations.

We have generally been using the byte order specific data types
(i.e. __be32 instead of u32) in most places.  This corrects a
declaration and adds a few needed casts.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index eb109035a..191fd0634 100644
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -54,9 +54,9 @@ static int gre_hdr_len(const struct tnl_port_config *port_config)
 static __be32 be64_get_low32(__be64 x)
 {
 #ifdef __BIG_ENDIAN
-	return x;
+	return (__force __be32)x;
 #else
-	return x >> 32;
+	return (__force __be32)((__force u64)x >> 32);
 #endif
 }
 
@@ -116,9 +116,9 @@ static struct sk_buff *gre_update_header(const struct vport *vport,
 static __be64 be32_extend_to_be64(__be32 x)
 {
 #ifdef __BIG_ENDIAN
-	return x;
+	return (__force __be64)x;
 #else
-	return (__be64) x << 32;
+	return (__force __be64)((__force u64)x << 32);
 #endif
 }