diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:51:02 +0000 |
| commit | afbf3d994e57e06f8f5669033ab0e89af44e49c4 (patch) | |
| tree | c94f0225aafe46c2716aa14d0f53941d81d40b8d /target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch | |
| parent | 23578461a92aca344eb5d34d59352da3163281a8 (diff) | |
| download | upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.gz upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.tar.bz2 upstream-afbf3d994e57e06f8f5669033ab0e89af44e49c4.zip | |
kernel: update linux 3.3 to 3.3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch b/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch index d95ddf65f4..247a312290 100644 --- a/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch +++ b/target/linux/generic/patches-3.3/130-pppoatm-queue-depth.patch @@ -34,8 +34,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net> net/atm/pppoatm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 85 insertions(+), 10 deletions(-) -diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c -index 614d3fc..ce1e59f 100644 --- a/net/atm/pppoatm.c +++ b/net/atm/pppoatm.c @@ -62,12 +62,25 @@ struct pppoatm_vcc { @@ -64,7 +62,7 @@ index 614d3fc..ce1e59f 100644 * Header used for LLC Encapsulated PPP (4 bytes) followed by the LCP protocol * ID (0xC021) used in autodetection */ -@@ -102,16 +115,30 @@ static void pppoatm_wakeup_sender(unsigned long arg) +@@ -102,16 +115,30 @@ static void pppoatm_wakeup_sender(unsign static void pppoatm_pop(struct atm_vcc *atmvcc, struct sk_buff *skb) { struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc); @@ -154,7 +152,7 @@ index 614d3fc..ce1e59f 100644 /* * Called by the ppp_generic.c to send a packet - returns true if packet * was accepted. If we return false, then it's our job to call -@@ -207,7 +279,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb) +@@ -207,7 +279,7 @@ static int pppoatm_send(struct ppp_chann struct sk_buff *n; n = skb_realloc_headroom(skb, LLC_LEN); if (n != NULL && @@ -163,7 +161,7 @@ index 614d3fc..ce1e59f 100644 kfree_skb(n); goto nospace; } -@@ -215,12 +287,12 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb) +@@ -215,12 +287,12 @@ static int pppoatm_send(struct ppp_chann skb = n; if (skb == NULL) return DROP_PACKET; @@ -178,7 +176,7 @@ index 614d3fc..ce1e59f 100644 goto nospace; break; case e_autodetect: -@@ -285,6 +357,9 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg) +@@ -285,6 +357,9 @@ static int pppoatm_assign_vcc(struct atm if (pvcc == NULL) return -ENOMEM; pvcc->atmvcc = atmvcc; @@ -188,6 +186,3 @@ index 614d3fc..ce1e59f 100644 pvcc->old_push = atmvcc->push; pvcc->old_pop = atmvcc->pop; pvcc->encaps = (enum pppoatm_encaps) be.encaps; --- -1.7.7.6 - |