6 files changed, 9 insertions, 9 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 48e1ccb2ff55..db72339c21e1 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -330,10 +330,10 @@ static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb)
 
 static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
 {
-        u32 saddr = 0;
+        __be32 saddr = 0;
         u8  *dst_ha = NULL;
         struct net_device *dev = neigh->dev;
-        u32 target = *(u32*)neigh->primary_key;
+        __be32 target = *(__be32*)neigh->primary_key;
         int probes = atomic_read(&neigh->probes);
         struct in_device *in_dev = in_dev_get(dev);
 
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 8e8d1f17d77a..bffbbecef455 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -876,9 +876,9 @@ out:
         return done;
 }
 
-u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope)
+__be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope)
 {
-        u32 addr = 0;
+        __be32 addr = 0;
         struct in_device *in_dev;
 
         rcu_read_lock();
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index c2ad07e48ab4..fd39685241c1 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -437,7 +437,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info)
         struct icmp_bxm icmp_param;
         struct rtable *rt = (struct rtable *)skb_in->dst;
         struct ipcm_cookie ipc;
-        u32 saddr;
+        __be32 saddr;
         u8  tos;
 
         if (!rt)
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index 1bca714bda3d..0c8d20da6139 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -464,7 +464,7 @@ join_mcast_group(struct sock *sk, struct in_addr *addr, char *ifname)
 static int bind_mcastif_addr(struct socket *sock, char *ifname)
 {
         struct net_device *dev;
-        u32 addr;
+        __be32 addr;
         struct sockaddr_in sin;
 
         if ((dev = __dev_get_by_name(ifname)) == NULL)
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index bc65168a3437..3dbfcfac8a84 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -70,7 +70,7 @@ masquerade_target(struct sk_buff **pskb,
         const struct ip_nat_multi_range_compat *mr;
         struct ip_nat_range newrange;
         struct rtable *rt;
-        u_int32_t newsrc;
+        __be32 newsrc;
 
         IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING);
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 32fcb77295f0..9d8fbf1e5bc3 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1532,7 +1532,7 @@ static int ip_rt_bug(struct sk_buff *skb)
 
 void ip_rt_get_source(u8 *addr, struct rtable *rt)
 {
-        u32 src;
+        __be32 src;
         struct fib_result res;
 
         if (rt->fl.iif == 0)
@@ -1603,7 +1603,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
 {
         unsigned hash;
         struct rtable *rth;
-        u32 spec_dst;
+        __be32 spec_dst;
         struct in_device *in_dev = in_dev_get(dev);
         u32 itag = 0;