Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / board / evb64260 / eth_addrtbl.c

diff --git a/board/evb64260/eth_addrtbl.c b/board/evb64260/eth_addrtbl.c
index 0abc7d453693b21067a38a0286107a5da5e38e4b..8c2c17f962922f3fea57655ea4b15a15c726933d 100644 (file)
--- a/board/evb64260/eth_addrtbl.c
+++ b/board/evb64260/eth_addrtbl.c
@@ -6,9 +6,6 @@
 #include "eth.h"
 #include "eth_addrtbl.h"
 
-#define TRUE 1
-#define FALSE 0
-
 #define PRINTF printf
 
 #ifdef CONFIG_GT_USE_MAC_HASH_TABLE
@@ -55,8 +52,9 @@ unsigned int initAddressTable (u32 port, u32 hashMode, u32 hashSizeSelector)
                int bytes =
                        hashLength[hashSizeSelector] * sizeof (addrTblEntry);
 
-               tableBase = (unsigned int) realAddrTableBase[port] =
+               realAddrTableBase[port] =
                        malloc (bytes + 64);
+               tableBase = (unsigned int)realAddrTableBase;
 
                if (!tableBase) {
                        printf ("%s: alloc memory failed \n", __FUNCTION__);
@@ -159,8 +157,8 @@ u32 hashTableFunction (u32 macH, u32 macL, u32 HashSize, u32 hash_mode)
  * rd   - the RD field in the address table.
  * Outputs
  * address table entry is added.
- * TRUE if success.
- * FALSE if table full
+ * true if success.
+ * false if table full
  */
 int addAddressTableEntry (u32 port, u32 macH, u32 macL, u32 rd, u32 skip)
 {
@@ -205,7 +203,7 @@ int addAddressTableEntry (u32 port, u32 macH, u32 macL, u32 rd, u32 skip)
 
        if (i == HOP_NUMBER) {
                PRINTF ("addGT64260addressTableEntry: table section is full\n");
-               return (FALSE);
+               return false;
        }
 
        /*
@@ -214,7 +212,7 @@ int addAddressTableEntry (u32 port, u32 macH, u32 macL, u32 rd, u32 skip)
        entry->hi = newHi;
        entry->lo = newLo;
        DCACHE_FLUSH_N_SYNC ((u32) entry, MAC_ENTRY_SIZE);
-       return (TRUE);
+       return true;
 }
 
 #endif /* CONFIG_GT_USE_MAC_HASH_TABLE */