From: stephen hemminger <[email protected]>

Use be32_to_cpu instead of htonl to keep sparse happy.

Signed-off-by: Stephen Hemminger <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

Sparse warning was probably:
net/ipv4/ip_vti.c:387:28: sparse: cast from restricted __be32
net/ipv4/ip_vti.c:454:36: sparse: cast from restricted __be32
Reported-by: Fengguang Wu <[email protected]>

Cc: <[email protected]> # 3.6.x b0558ef24
Cc: <[email protected]> # 3.6.x 
Upstream-ID: 8437e7610c2d3e06f87f71fb82e10ed4b291812a
Stable-Trees: 3.6
Signed-off-by: Peter Huewe <[email protected]>
---
 net/ipv4/ip_vti.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 3b69562..858fddf 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -379,7 +379,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, 
struct net_device *dev)
 
        memset(&fl4, 0, sizeof(fl4));
        flowi4_init_output(&fl4, tunnel->parms.link,
-                          htonl(tunnel->parms.i_key), RT_TOS(tos),
+                          be32_to_cpu(tunnel->parms.i_key), RT_TOS(tos),
                           RT_SCOPE_UNIVERSE,
                           IPPROTO_IPIP, 0,
                           dst, tiph->saddr, 0, 0);
@@ -446,7 +446,7 @@ static int vti_tunnel_bind_dev(struct net_device *dev)
                struct flowi4 fl4;
                memset(&fl4, 0, sizeof(fl4));
                flowi4_init_output(&fl4, tunnel->parms.link,
-                                  htonl(tunnel->parms.i_key),
+                                  be32_to_cpu(tunnel->parms.i_key),
                                   RT_TOS(iph->tos), RT_SCOPE_UNIVERSE,
                                   IPPROTO_IPIP, 0,
                                   iph->daddr, iph->saddr, 0, 0);
-- 
1.7.8.6

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to