diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2013-10-01 11:35:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 18:14:26 -0700 |
| commit | 196eb57b30433a60f2a488e06dd46cf56999b15c (patch) | |
| tree | dcb840dabca9df62cc861cf712d58aff97752646 /net | |
| parent | 0accb77476d803ae62f2519c04e32f9eb2495698 (diff) | |
ip_tunnel_core: Change __skb_push back to skb_push
[ Upstream commit 78a3694d44a029242dd0830b34ab20ef1704be35 ]
Git commit 0e6fbc5b ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 850525b34899..3fbba1753f2c 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -63,7 +63,7 @@ int iptunnel_xmit(struct net *net, struct rtable *rt, 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); |