projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[target] ixp4xx: add missing config symbol for 2.6.30
[openwrt.git]
/
target
/
linux
/
ps3
/
patches-2.6.30
/
0016-ps3-gelic-fix-rxdmac.patch
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
00204e3
..
1cb202d
100644
(file)
--- 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
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
-@@ -9
70,10 +970
,6 @@ static int gelic_card_decode_one_descr(s
+@@ -9
69,10 +969
,6 @@ static int gelic_card_decode_one_descr(s
int dmac_chain_ended;
status = gelic_descr_get_status(descr);
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;
if (status == GELIC_DESCR_DMA_CARDOWNED)
return 0;
-@@ -103
6,6 +1032
,11 @@ static int gelic_card_decode_one_descr(s
+@@ -103
5,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:
/* 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
/*
* So that always DMAC can see the end
* of the descriptor chain to avoid
-@@ -106
4,10 +1065
,9 @@ refill:
+@@ -106
3,10 +1064
,9 @@ refill:
* If dmac chain was met, DMAC stopped.
* thus re-enable it
*/
* 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;
}
return 1;
}
-@@ -113
3,11 +1133
,6 @@ static irqreturn_t gelic_card_interrupt(
+@@ -113
2,11 +1132
,6 @@ static irqreturn_t gelic_card_interrupt(
status &= card->irq_mask;
status &= card->irq_mask;
This page took
0.02735 seconds
and
4
git commands to generate.