aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ps3/patches-2.6.30
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-10-01 10:07:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-10-01 10:07:32 +0000
commit5a3991bd1a491d6fca3273c1ef72b54cdfd0661d (patch)
tree8156c94dfbaf686c6f4d07abf0a898ddc3c3d51c /target/linux/ps3/patches-2.6.30
parent2b43a77babbe2071df374f67799679bce8216904 (diff)
downloadupstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.tar.gz
upstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.tar.bz2
upstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.zip
kernel: upgrade to 2.6.30.8 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ps3/patches-2.6.30')
-rw-r--r--target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch b/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch
index 00204e374e..1cb202d4f5 100644
--- a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch
+++ b/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch
@@ -28,7 +28,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
-@@ -970,10 +970,6 @@ static int gelic_card_decode_one_descr(s
+@@ -969,10 +969,6 @@ static int gelic_card_decode_one_descr(s
int dmac_chain_ended;
status = gelic_descr_get_status(descr);
@@ -39,7 +39,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
if (status == GELIC_DESCR_DMA_CARDOWNED)
return 0;
-@@ -1036,6 +1032,11 @@ static int gelic_card_decode_one_descr(s
+@@ -1035,6 +1031,11 @@ static int gelic_card_decode_one_descr(s
/* ok, we've got a packet in descr */
gelic_net_pass_skb_up(descr, card, netdev);
refill:
@@ -51,7 +51,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
/*
* So that always DMAC can see the end
* of the descriptor chain to avoid
-@@ -1064,10 +1065,9 @@ refill:
+@@ -1063,10 +1064,9 @@ refill:
* If dmac chain was met, DMAC stopped.
* thus re-enable it
*/
@@ -65,7 +65,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
return 1;
}
-@@ -1133,11 +1133,6 @@ static irqreturn_t gelic_card_interrupt(
+@@ -1132,11 +1132,6 @@ static irqreturn_t gelic_card_interrupt(
status &= card->irq_mask;