mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -13,7 +13,7 @@ MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>
|
||||
SUBTARGETS=petitboot
|
||||
FEATURES+=powerpc64
|
||||
|
||||
LINUX_VERSION:=2.6.30.7
|
||||
LINUX_VERSION:=2.6.30.8
|
||||
|
||||
KERNEL_CC:=
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user