summaryrefslogtreecommitdiff
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 15:42:47 -0700
commit832ae42a43dd7ea2a39d7cc0687363d0039da850 (patch)
tree840afb1d004cfe470723a78da32fb26f9522285a
parent3c5bd142cbe6ca27b0e55451a4c37c703bc6ff66 (diff)
downloadkernel-common-832ae42a43dd7ea2a39d7cc0687363d0039da850.tar.gz
kernel-common-832ae42a43dd7ea2a39d7cc0687363d0039da850.tar.bz2
kernel-common-832ae42a43dd7ea2a39d7cc0687363d0039da850.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>
-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 4910176d24ed..7fc9f5578cb2 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1342,7 +1342,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;