← Back to branch summary

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

« back to all changes in this revision

Viewing changes to net/ipv4/ip_gre.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2013-07-11 18:35:20 UTC
  • Revision ID: package-import@ubuntu.com-20130711183520-htnf1x4y5r11hndr
Tags: 3.5.0-229.42
https://launchpad.net/bugs/1199276
* Release Tracking Bug
  - LP: #1199276

[ Paolo Pisati ]

* [Config] CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/ip_gre.c
743
743
                tiph = &tunnel->parms.iph;
744
744
        }
745
745
 
 
746
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
746
747
        if ((dst = tiph->daddr) == 0) {
747
748
                /* NBMA tunnel */
748
749
 
886
887
        skb_reset_transport_header(skb);
887
888
        skb_push(skb, gre_hlen);
888
889
        skb_reset_network_header(skb);
889
 
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
890
890
        IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
891
891
                              IPSKB_REROUTED);
892
892
        skb_dst_drop(skb);