← Back to branch summary

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

« back to all changes in this revision

Viewing changes to net/ipv4/ipip.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/ipip.c
465
465
        if (tos & 1)
466
466
                tos = old_iph->tos;
467
467
 
 
468
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
468
469
        if (!dst) {
469
470
                /* NBMA tunnel */
470
471
                if ((rt = skb_rtable(skb)) == NULL) {
547
548
        skb->transport_header = skb->network_header;
548
549
        skb_push(skb, sizeof(struct iphdr));
549
550
        skb_reset_network_header(skb);
550
 
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
551
551
        IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
552
552
                              IPSKB_REROUTED);
553
553
        skb_dst_drop(skb);