lkml.org 
[lkml]   [2013]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 047/135] ip_tunnel_core: Change __skb_push back to skb_push
    Date
    3.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Steffen Klassert <steffen.klassert@secunet.com>

    [ 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>
    ---
    net/ipv4/ip_tunnel_core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/ipv4/ip_tunnel_core.c
    +++ b/net/ipv4/ip_tunnel_core.c
    @@ -63,7 +63,7 @@ int iptunnel_xmit(struct net *net, struc
    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);



    \
     
     \ /
      Last update: 2013-10-11 23:41    [W:4.094 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site