diff options
author | Krzysztof Halasa <khc@pm.waw.pl> | 2008-04-20 13:06:39 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-29 01:56:50 -0400 |
commit | dac2f83fce01f0c2900918a4a8abd4c652151804 (patch) | |
tree | 1ff0775cc0d07fa382cfe54cb233729e12b9e576 /arch/arm | |
parent | 770f867991155f9c9e36a845a142f770d55ee67c (diff) |
Driver for IXP4xx built-in Ethernet ports
Adds a driver for built-in IXP4xx Ethernet ports.
Signed-off-by: Krzysztof HaĆasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_npe.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c index 83c137ec582c..63a23fa4aab4 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c | |||
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what) | |||
448 | return -ETIMEDOUT; | 448 | return -ETIMEDOUT; |
449 | } | 449 | } |
450 | 450 | ||
451 | #if DEBUG_MSG > 1 | ||
451 | debug_msg(npe, "Sending a message took %i cycles\n", cycles); | 452 | debug_msg(npe, "Sending a message took %i cycles\n", cycles); |
453 | #endif | ||
452 | return 0; | 454 | return 0; |
453 | } | 455 | } |
454 | 456 | ||
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what) | |||
484 | return -ETIMEDOUT; | 486 | return -ETIMEDOUT; |
485 | } | 487 | } |
486 | 488 | ||
489 | #if DEBUG_MSG > 1 | ||
487 | debug_msg(npe, "Receiving a message took %i cycles\n", cycles); | 490 | debug_msg(npe, "Receiving a message took %i cycles\n", cycles); |
491 | #endif | ||
488 | return 0; | 492 | return 0; |
489 | } | 493 | } |
490 | 494 | ||
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c index e83301325301..fab94eaecee7 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | |||
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue) | |||
184 | case 3: mask[0] = 0xFF; break; | 184 | case 3: mask[0] = 0xFF; break; |
185 | } | 185 | } |
186 | 186 | ||
187 | mask[1] = mask[2] = mask[3] = 0; | ||
188 | |||
187 | while (addr--) | 189 | while (addr--) |
188 | shift_mask(mask); | 190 | shift_mask(mask); |
189 | 191 | ||