diff options
| author | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2009-04-05 10:41:54 +0200 |
|---|---|---|
| committer | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2009-04-05 10:41:54 +0200 |
| commit | b9bf18e0fa08ef0d9a95b4a43e3d4fa39b8b7729 (patch) | |
| tree | 3b7c3b7efbf487ca95405355688a3972776f5a81 /patches | |
| parent | 7f4a4f54d48dc694dfc06e551eaca78395861e72 (diff) | |
'bump to next version, added additional id fpr 2870'
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/revert-napi.patch | 45 | ||||
| -rw-r--r-- | patches/rt2870.patch | 11 |
2 files changed, 11 insertions, 45 deletions
diff --git a/patches/revert-napi.patch b/patches/revert-napi.patch deleted file mode 100644 index 554393b..0000000 --- a/patches/revert-napi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Herbert Xu <herbert@gondor.apana.org.au> -Date: Tue, 17 Mar 2009 20:11:29 +0000 (-0700) -Subject: gro: Fix legacy path napi_complete crash -X-Git-Tag: v2.6.29~3^2~24 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=303c6a0251852ecbdc5c15e466dcaff5971f7517 - -gro: Fix legacy path napi_complete crash - -On the legacy netif_rx path, I incorrectly tried to optimise -the napi_complete call by using __napi_complete before we reenable -IRQs. This simply doesn't work since we need to flush the held -GRO packets first. - -This patch fixes it by doing the obvious thing of reenabling -IRQs first and then calling napi_complete. - -Reported-by: Frank Blaschka <blaschka@linux.vnet.ibm.com> -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - -diff --git a/net/core/dev.c b/net/core/dev.c -index f112970..2565f6d 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -2588,9 +2588,9 @@ static int process_backlog(struct napi_struct *napi, int quota) - local_irq_disable(); - skb = __skb_dequeue(&queue->input_pkt_queue); - if (!skb) { -+ __napi_complete(napi); - local_irq_enable(); -+ break; -- napi_complete(napi); -- goto out; - } - local_irq_enable(); - -@@ -2599,7 +2599,6 @@ static int process_backlog(struct napi_struct *napi, int quota) - - napi_gro_flush(napi); - --out: - return work; - } - diff --git a/patches/rt2870.patch b/patches/rt2870.patch new file mode 100644 index 0000000..0dda620 --- /dev/null +++ b/patches/rt2870.patch @@ -0,0 +1,11 @@ +--- old/src/linux-2.6.29/drivers/staging/rt2870/rt2870.h 2009-03-24 00:12:14.000000000 +0100 ++++ new/src/linux-2.6.29/drivers/staging/rt2870/rt2870.h 2009-03-27 21:18:12.000000000 +0100 +@@ -104,6 +104,7 @@ + {USB_DEVICE(0x14B2,0x3C07)}, /* AL */ \ + {USB_DEVICE(0x14B2,0x3C12)}, /* AL */ \ + {USB_DEVICE(0x050D,0x8053)}, /* Belkin */ \ ++ {USB_DEVICE(0x050D,0x815C)}, /* Belkin */ \ + {USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */ \ + {USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */ \ + {USB_DEVICE(0x07AA,0x002F)}, /* Corega */ \ + |