Skip to content

Commit

Permalink
ip_tunnel_core: Change __skb_push back to skb_push
Browse files Browse the repository at this point in the history
Git commit 0e6fbc5 ("ip_tunnels: extend iptunnel_xmit()")
moved the IP header installation to iptunnel_xmit() and
changed skb_push() to __skb_push(). This makes possible
bugs hard to track down, so change it back to skb_push().

Cc: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Steffen Klassert authored and David S. Miller committed Oct 1, 2013
1 parent 6701328 commit 78a3694
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ipv4/ip_tunnel_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb,
memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

/* Push down and install the IP header. */
__skb_push(skb, sizeof(struct iphdr));
skb_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);

iph = ip_hdr(skb);
Expand Down

0 comments on commit 78a3694

Please sign in to comment.