← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/net/ppp/ppp_generic.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:
drivers/net/ppp/ppp_generic.c
2024
2024
                        continue;
2025
2025
                }
2026
2026
                if (PPP_MP_CB(p)->sequence != seq) {
2027
 
                        u32 oldseq;
2028
2027
                        /* Fragment `seq' is missing.  If it is after
2029
2028
                           minseq, it might arrive later, so stop here. */
2030
2029
                        if (seq_after(seq, minseq))
2031
2030
                                break;
2032
2031
                        /* Fragment `seq' is lost, keep going. */
2033
2032
                        lost = 1;
2034
 
                        oldseq = seq;
2035
2033
                        seq = seq_before(minseq, PPP_MP_CB(p)->sequence)?
2036
2034
                                minseq + 1: PPP_MP_CB(p)->sequence;
2037
 
 
2038
 
                        if (ppp->debug & 1)
2039
 
                                netdev_printk(KERN_DEBUG, ppp->dev,
2040
 
                                              "lost frag %u..%u\n",
2041
 
                                              oldseq, seq-1);
2042
 
 
2043
2035
                        goto again;
2044
2036
                }
2045
2037
 
2084
2076
                        struct sk_buff *tmp2;
2085
2077
 
2086
2078
                        skb_queue_reverse_walk_from_safe(list, p, tmp2) {
2087
 
                                if (ppp->debug & 1)
2088
 
                                        netdev_printk(KERN_DEBUG, ppp->dev,
2089
 
                                                      "discarding frag %u\n",
2090
 
                                                      PPP_MP_CB(p)->sequence);
2091
2079
                                __skb_unlink(p, list);
2092
2080
                                kfree_skb(p);
2093
2081
                        }
2103
2091
                /* If we have discarded any fragments,
2104
2092
                   signal a receive error. */
2105
2093
                if (PPP_MP_CB(head)->sequence != ppp->nextseq) {
2106
 
                        skb_queue_walk_safe(list, p, tmp) {
2107
 
                                if (p == head)
2108
 
                                        break;
2109
 
                                if (ppp->debug & 1)
2110
 
                                        netdev_printk(KERN_DEBUG, ppp->dev,
2111
 
                                                      "discarding frag %u\n",
2112
 
                                                      PPP_MP_CB(p)->sequence);
2113
 
                                __skb_unlink(p, list);
2114
 
                                kfree_skb(p);
2115
 
                        }
2116
 
 
2117
2094
                        if (ppp->debug & 1)
2118
2095
                                netdev_printk(KERN_DEBUG, ppp->dev,
2119
2096
                                              "  missed pkts %u..%u\n",