* [PATCH] mv643xx add missing brackets
@ 2006-11-30 9:35 Mariusz Kozlowski
2006-11-30 10:07 ` Dale Farnsworth
0 siblings, 1 reply; 4+ messages in thread
From: Mariusz Kozlowski @ 2006-11-30 9:35 UTC (permalink / raw)
To: dale, mlachwani; +Cc: netdev, linux-kernel
Hello,
This patch adds missing brackets.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
include/linux/mv643xx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.19-rc6-mm2-a/include/linux/mv643xx.h 2006-11-16 05:03:40.000000000 +0100
+++ linux-2.6.19-rc6-mm2-b/include/linux/mv643xx.h 2006-11-30 01:10:53.000000000 +0100
@@ -724,7 +724,7 @@
#define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
#define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
#define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
+#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
#define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
@@ -1135,7 +1135,7 @@ struct mv64xxx_i2c_pdata {
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
-#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5 ((1<<21) | (1<<19))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6 ((1<<21) | (1<<20))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7 ((1<<21) | (1<<20) | (1<<19))
--
Regards,
Mariusz Kozlowski
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mv643xx add missing brackets
2006-11-30 9:35 [PATCH] mv643xx add missing brackets Mariusz Kozlowski
@ 2006-11-30 10:07 ` Dale Farnsworth
2006-11-30 10:33 ` Mariusz Kozlowski
0 siblings, 1 reply; 4+ messages in thread
From: Dale Farnsworth @ 2006-11-30 10:07 UTC (permalink / raw)
To: Mariusz Kozlowski; +Cc: dale, mlachwani, netdev, linux-kernel
On Thu, Nov 30, 2006 at 10:35:37AM +0100, Mariusz Kozlowski wrote:
> Hello,
>
> This patch adds missing brackets.
>
> Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
>
> include/linux/mv643xx.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-2.6.19-rc6-mm2-a/include/linux/mv643xx.h 2006-11-16 05:03:40.000000000 +0100
> +++ linux-2.6.19-rc6-mm2-b/include/linux/mv643xx.h 2006-11-30 01:10:53.000000000 +0100
> @@ -724,7 +724,7 @@
> #define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
> #define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
> #define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
> -#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
> +#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10))
Good. Thanks.
> #define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
> #define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
> #define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
> @@ -1135,7 +1135,7 @@ struct mv64xxx_i2c_pdata {
> #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
> #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
> #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
> -#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
> +#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21))
Mariusz, please remove the extra parenthesis instead of adding
an extra one, like:
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 (1<<21)
and resubmit.
Thanks,
-Dale
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mv643xx add missing brackets
2006-11-30 10:07 ` Dale Farnsworth
@ 2006-11-30 10:33 ` Mariusz Kozlowski
2006-11-30 11:27 ` [PATCH] mv643xx_eth: fix unbalanced parentheses in macros Dale Farnsworth
0 siblings, 1 reply; 4+ messages in thread
From: Mariusz Kozlowski @ 2006-11-30 10:33 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: mlachwani, netdev, linux-kernel
> > +#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21))
>
> Mariusz, please remove the extra parenthesis instead of adding
> an extra one, like:
> #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 (1<<21)
> and resubmit.
Sure. Here it goes. Second try:
This patch fixes some mv643xx macros.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
include/linux/mv643xx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.19-rc6-mm2-a/include/linux/mv643xx.h 2006-11-16 05:03:40.000000000 +0100
+++ linux-2.6.19-rc6-mm2-b/include/linux/mv643xx.h 2006-11-30 11:30:14.000000000 +0100
@@ -724,7 +724,7 @@
#define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
#define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
#define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
+#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
#define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
@@ -1135,7 +1135,7 @@ struct mv64xxx_i2c_pdata {
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
-#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 (1<<21)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5 ((1<<21) | (1<<19))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6 ((1<<21) | (1<<20))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7 ((1<<21) | (1<<20) | (1<<19))
--
Regards,
Mariusz Kozlowski
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] mv643xx_eth: fix unbalanced parentheses in macros
2006-11-30 10:33 ` Mariusz Kozlowski
@ 2006-11-30 11:27 ` Dale Farnsworth
0 siblings, 0 replies; 4+ messages in thread
From: Dale Farnsworth @ 2006-11-30 11:27 UTC (permalink / raw)
To: Jeff Garzik
Cc: Dale Farnsworth, mlachwani, netdev, linux-kernel, Mariusz Kozlowski
From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
---
include/linux/mv643xx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.19-rc6-mm2-a/include/linux/mv643xx.h 2006-11-16 05:03:40.000000000 +0100
+++ linux-2.6.19-rc6-mm2-b/include/linux/mv643xx.h 2006-11-30 11:30:14.000000000 +0100
@@ -724,7 +724,7 @@
#define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
#define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
#define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
+#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
#define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
#define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
@@ -1135,7 +1135,7 @@ struct mv64xxx_i2c_pdata {
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
-#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 (1<<21)
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5 ((1<<21) | (1<<19))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6 ((1<<21) | (1<<20))
#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7 ((1<<21) | (1<<20) | (1<<19))
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-11-30 11:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-11-30 9:35 [PATCH] mv643xx add missing brackets Mariusz Kozlowski
2006-11-30 10:07 ` Dale Farnsworth
2006-11-30 10:33 ` Mariusz Kozlowski
2006-11-30 11:27 ` [PATCH] mv643xx_eth: fix unbalanced parentheses in macros Dale Farnsworth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®