← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/ipv4/xfrm4_mode_tunnel.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/xfrm4_mode_tunnel.c
66
66
 
67
67
static int xfrm4_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
68
68
{
 
69
        const unsigned char *old_mac;
69
70
        int err = -EINVAL;
70
71
 
71
72
        if (XFRM_MODE_SKB_CB(skb)->protocol != IPPROTO_IPIP)
83
84
        if (!(x->props.flags & XFRM_STATE_NOECN))
84
85
                ipip_ecn_decapsulate(skb);
85
86
 
 
87
        old_mac = skb_mac_header(skb);
 
88
        skb_set_mac_header(skb, -skb->mac_len);
 
89
        memmove(skb_mac_header(skb), old_mac, skb->mac_len);
86
90
        skb_reset_network_header(skb);
87
 
        skb_mac_header_rebuild(skb);
88
 
 
89
91
        err = 0;
90
92
 
91
93
out: