Merge branch 'master' into gfs2

1 files changed, 7 insertions, 7 deletions

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index e05d54a90743..7da2cee8e132 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -142,7 +142,7 @@ struct vif_device
         unsigned long   rate_limit;             /* Traffic shaping (NI)         */
         unsigned char   threshold;              /* TTL threshold                */
         unsigned short  flags;                  /* Control flags                */
-        __u32           local,remote;           /* Addresses(remote for tunnels)*/
+        __be32          local,remote;           /* Addresses(remote for tunnels)*/
         int             link;                   /* Physical interface index     */
 };
 
@@ -151,8 +151,8 @@ struct vif_device
 struct mfc_cache 
 {
         struct mfc_cache *next;                 /* Next entry on cache line     */
-        __u32 mfc_mcastgrp;                     /* Group the entry belongs to   */
-        __u32 mfc_origin;                       /* Source of packet             */
+        __be32 mfc_mcastgrp;                    /* Group the entry belongs to   */
+        __be32 mfc_origin;                      /* Source of packet             */
         vifi_t mfc_parent;                      /* Source interface             */
         int mfc_flags;                          /* Flags on line                */
 
@@ -179,9 +179,9 @@ struct mfc_cache
 #define MFC_LINES               64
 
 #ifdef __BIG_ENDIAN
-#define MFC_HASH(a,b)   ((((a)>>24)^((b)>>26))&(MFC_LINES-1))
+#define MFC_HASH(a,b)   (((((__force u32)(__be32)a)>>24)^(((__force u32)(__be32)b)>>26))&(MFC_LINES-1))
 #else
-#define MFC_HASH(a,b)   (((a)^((b)>>2))&(MFC_LINES-1))
+#define MFC_HASH(a,b)   ((((__force u32)(__be32)a)^(((__force u32)(__be32)b)>>2))&(MFC_LINES-1))
 #endif          
 
 #endif
@@ -213,8 +213,8 @@ struct pimreghdr
 {
         __u8    type;
         __u8    reserved;
-        __u16   csum;
-        __u32   flags;
+        __be16  csum;
+        __be32  flags;
 };
 
 extern int pim_rcv_v1(struct sk_buff *);