From 177e5b34d5811d0600cacaf7d3d032be6e73df70 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 11 Dec 2007 14:28:16 +0000
Subject: [PATCH] Moved MAC and ethernet definitions to include/net/ethernet.h

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@443 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/c5471/c5471_ethernet.c | 3 ++-
 arch/sim/src/up_uipdriver.c         | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index a36b519087f..76a565fcd8b 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -57,6 +57,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
+#include <net/ethernet.h>
 #include <net/uip/uip.h>
 #include <net/uip/uip-arp.h>
 #include <net/uip/uip-arch.h>
@@ -2054,7 +2055,7 @@ static void c5471_reset(struct c5471_driver_s *c5471)
 static void c5471_macassign(struct c5471_driver_s *c5471)
 {
   struct uip_driver_s *dev = &c5471->c_dev;
-  uint8 *mptr = dev->d_mac.addr;
+  uint8 *mptr = dev->d_mac.ether_addr_octet;
   register uint32 tmp;
 
   ndbg("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c
index dbc78f9c04f..d5d2ecbfc51 100644
--- a/arch/sim/src/up_uipdriver.c
+++ b/arch/sim/src/up_uipdriver.c
@@ -50,6 +50,7 @@
 #include <sched.h>
 #include <nuttx/net.h>
 
+#include <net/ethernet.h>
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 #include <net/uip/uip-arp.h>
@@ -106,9 +107,9 @@ void timer_reset(struct timer *t)
 #ifdef CONFIG_NET_PROMISCUOUS
 # define up_comparemac(a,b) (0)
 #else
-static inline int up_comparemac(struct uip_eth_addr *paddr1, struct uip_eth_addr *paddr2)
+static inline int up_comparemac(struct ether_addr *paddr1, struct ether_addr *paddr2)
 {
-  return memcmp(paddr1, paddr2, sizeof(struct uip_eth_addr));
+  return memcmp(paddr1, paddr2, sizeof(struct ether_addr));
 }
 #endif
 
@@ -212,7 +213,7 @@ int uipdriver_init(void)
 
   timer_set(&g_periodic_timer, 500);
   tapdev_init();
-  (void)tapdev_getmacaddr(g_sim_dev.d_mac.addr);
+  (void)tapdev_getmacaddr(g_sim_dev.d_mac.ether_addr_octet);
 
   /* Register the device with the OS so that socket IOCTLs can be performed */