ucc_geth: fix compilation
Subsystems (2)
PATCH 1/1 ucc_geth: fix compilation
This patch is against paulus/powerpc.git or galak/powerpc.git tree. Both affected.
- - - -
From: Anton Vorontsov <[email protected]>
There is no qe_bd_t typedef any longer, now it's struct qe_bd.
--- drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +1 -1
@@ -2148,7 +2148,7 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)for (j =0 ; j < ugeth->ug_info->bdRingLenTx[i]; j++) {if (ugeth->tx_skbuff[i][j]) {dma_unmap_single (NULL , - ((qe_bd_t *)bd)->buf, + ((struct qe_bd *)bd)->buf, (in_be32 ((u32 *)bd) &BD_LENGTH_MASK ),DMA_TO_DEVICE );
Signature · 1 line
1.5.0.6
Quoted 2 lines · Anton Vorontsov
This patch is against paulus/powerpc.git or galak/powerpc.git tree. Both affected.
This is an important fix. Without it, 836x and 832x won't build.
Signature · 2 lines
Timur Tabi Linux Kernel Developer @ Freescale
PATCH 1/1 ucc_geth: fix compilation
In reply to Anton VorontsovCurrently qe_bd_t is used in the macro call -- dma_unmap_single, which is a no-op on PPC32, thus error is hidden today. Starting with 2.6.24, macro will be replaced by the empty static function, and erroneous use of qe_bd_t will trigger compilation error.
---
Reposting this to include netdev in Cc.
drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +1 -1
@@ -2148,7 +2148,7 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)for (j =0 ; j < ugeth->ug_info->bdRingLenTx[i]; j++) {if (ugeth->tx_skbuff[i][j]) {dma_unmap_single (NULL , - ((qe_bd_t *)bd)->buf, + ((struct qe_bd *)bd)->buf, (in_be32 ((u32 *)bd) &BD_LENGTH_MASK ),DMA_TO_DEVICE );
Signature · 1 line
1.5.0.6
Quoted 7 lines · Anton Vorontsov
Currently
qe_bd_tis used in the macro call --dma_unmap_single, which is a no-op on PPC32, thus error is hidden today. Starting with 2.6.24, macro will be replaced by the empty static function, and erroneous use ofqe_bd_twill trigger compilation error.Signed-off-by Anton Vorontsov <[email protected]>---
Jeff, I'm going to pick this up via the powerpc.git tree since its currently only broken in our for-2.6.24 branch (because of other changes in there). Any issues?
- k
Quoted 26 lines
Reposting this to include netdev in Cc.
drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/ucc_geth.c +1
-1@@ -2148,7 +2148,7 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)for (j =0 ; j < ugeth->ug_info->bdRingLenTx[i]; j++) {if (ugeth->tx_skbuff[i][j]) { dma_unmap_single(NULL, - ((qe_bd_t *)bd)->buf, + ((struct qe_bd *)bd)->buf, (in_be32((u32 *)bd) & BD_LENGTH_MASK),
DMA_TO_DEVICE);Signature · 5 lines
1.5.0.6 - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 18 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Kumar Gala
Sent: Friday, September 14, 2007 10:08 PM
To: Jeff Garzik
Cc: [email protected] list; netdev
Subject: Re: [PATCH]ucc_geth: fix compilationQuoted 1 line · Anton Vorontsov
Currently
qe_bd_tis used in the macro call --
dma_unmap_single, whichQuoted 1 line
is a no-op on PPC32, thus error is hidden today. Starting
with 2.6.24,
Quoted 1 line
macro will be replaced by the empty static function, and
erroneous use
Quoted 8 lines
Quoted 4 lines
of
qe_bd_twill trigger compilation error.Signed-off-by Anton Vorontsov <[email protected]>---
Jeff, I'm going to pick this up via the powerpc.git tree since its currently only broken in our for-2.6.24 branch (because of other changes in there). Any issues?
Kumar,
Kim Phillips has posted the same patch to netdev list before Anton. Therefore, I do prefer to use his. Thanks
- Leo
Quoted 23 lines · On Sep 18, 2007, at 3:56 AM, Li Yang-r58472 wrote:
Quoted 23 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Kumar Gala
Sent: Friday, September 14, 2007 10:08 PM
To: Jeff Garzik
Cc: [email protected] list; netdev
Subject: Re: [PATCH]ucc_geth: fix compilationQuoted 1 line · Anton Vorontsov
Currently
qe_bd_tis used in the macro call --
dma_unmap_single, whichQuoted 1 line
is a no-op on PPC32, thus error is hidden today. Starting
with 2.6.24,
Quoted 1 line
macro will be replaced by the empty static function, and
erroneous use
Quoted 4 lines
of
qe_bd_twill trigger compilation error.Signed-off-by Anton Vorontsov <[email protected]>---
Quoted 8 lines
Quoted 3 lines
Jeff, I'm going to pick this up via the powerpc.git tree since its currently only broken in our for-2.6.24 branch (because of other changes in there). Any issues?
Kumar,
Kim Phillips has posted the same patch to netdev list before Anton. Therefore, I do prefer to use his. Thanks
No problem. Jeff seems to have picked up some version of the fix.
- k
Jeff Garzik
AppliedQuoted 5 lines · Anton Vorontsov
Currently
qe_bd_tis used in the macro call --dma_unmap_single, which is a no-op on PPC32, thus error is hidden today. Starting with 2.6.24, macro will be replaced by the empty static function, and erroneous use ofqe_bd_twill trigger compilation error.
Quoted 7 lines
Signed-off-by Anton Vorontsov <[email protected]>---
Reposting this to include netdev in Cc.
drivers/net/ucc_geth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
applied