From: Ansis Atteka <aatteka@nicira.com>
Date: Wed, 18 Sep 2013 22:29:52 +0000 (-0700)
Subject: ip: use ip_hdr() in __ip_make_skb() to retrieve IP header
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd176b578d356844f68176a1e0b6346c1cc9e33d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ip: use ip_hdr() in __ip_make_skb() to retrieve IP header

[ Upstream commit 749154aa56b57652a282cbde57a57abc278d1205 ]

skb->data already points to IP header, but for the sake of
consistency we can also use ip_hdr() to retrieve it.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 4bcabf3ab4ca..b663b7bda131 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1324,7 +1324,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
 	else
 		ttl = ip_select_ttl(inet, &rt->dst);
 
-	iph = (struct iphdr *)skb->data;
+	iph = ip_hdr(skb);
 	iph->version = 4;
 	iph->ihl = 5;
 	iph->tos = inet->tos;