summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAnsis Atteka <aatteka@nicira.com>2013-09-18 15:29:52 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 16:08:30 -0700
commitcd176b578d356844f68176a1e0b6346c1cc9e33d (patch)
treefe8185f40f26ba97381be7b531108e8dc214ed17 /net
parentf25e4f35defd609b3e6ad2ae5e871bdbcc0af333 (diff)
downloadlinux-3.10-cd176b578d356844f68176a1e0b6346c1cc9e33d.tar.gz
linux-3.10-cd176b578d356844f68176a1e0b6346c1cc9e33d.tar.bz2
linux-3.10-cd176b578d356844f68176a1e0b6346c1cc9e33d.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 4bcabf3ab4c..b663b7bda13 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;