diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:28:16 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:28:16 +0000 |
| commit | 5aa10a765807c59b4ba7e8bc546723125992eacc (patch) | |
| tree | 37f83fc854c9a8e5330849b89cda2bf06ce76edf /nuttx/arch/sim | |
| parent | b01a17e3235e9cbe98a11ff3095e6792b8e6eb9c (diff) | |
| download | px4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.tar.gz px4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.tar.bz2 px4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.zip | |
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
Diffstat (limited to 'nuttx/arch/sim')
| -rw-r--r-- | nuttx/arch/sim/src/up_uipdriver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c index dbc78f9c0..d5d2ecbfc 100644 --- a/nuttx/arch/sim/src/up_uipdriver.c +++ b/nuttx/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 */ |