diff options
| author |   Steffen Klassert <steffen.klassert@secunet.com> | 2013-10-01 11:35:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-10-01 12:42:16 -0400 |
| commit | 78a3694d44a029242dd0830b34ab20ef1704be35 (patch) | |
| tree | c0731642f6efbcda0195d922c23251eef4c67c85 /net/ipv4/ip_tunnel_core.c | |
| parent | ip_tunnel: Add fallback tunnels to the hash lists (diff) | |
| download | linux-dev-78a3694d44a029242dd0830b34ab20ef1704be35.tar.xz linux-dev-78a3694d44a029242dd0830b34ab20ef1704be35.zip | |
ip_tunnel_core: Change __skb_push back to skb_push
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>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
| -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 d6c856b17fd4..c31e3ad98ef2 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -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); |