sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Misc build fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3402 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-19 21:25:55 +00:00
parent 663ea6d478
commit f189c65605
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sim/src/up_netdev.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* up_tapdev.c
* arch/sim/src/up_tapdev.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -44,6 +44,10 @@
* Private Definitions
****************************************************************************/
#ifndef NULL
# define NULL (void*)0
#endif
/****************************************************************************
* Private Types
****************************************************************************/

39
arch/sim/src/up_tapdev.c
View File

@ -135,33 +135,32 @@ static inline void dump_ethhdr(const char *msg, unsigned char *buf, int buflen)
static int up_setmacaddr(void)
{
unsigned char macaddr[6];
int sockfd;
int ret = -1;
if (macaddr)
/* Get a socket (only so that we get access to the INET subsystem) */
sockfd = socket(PF_INET, SOCK_DGRAM, 0);
if (sockfd >= 0)
{
/* Get a socket (only so that we get access to the INET subsystem) */
struct ifreq req;
memset(&req, 0, sizeof(struct ifreq));
int sockfd = socket(PF_INET, SOCK_DGRAM, 0);
if (sockfd >= 0)
/* Put the driver name into the request */
strncpy(req.ifr_name, "tap0", IFNAMSIZ);
/* Perform the ioctl to get the MAC address */
ret = ioctl(sockfd, SIOCGIFHWADDR, (unsigned long)&req);
if (!ret)
{
struct ifreq req;
memset(&req, 0, sizeof(struct ifreq));
/* Set the MAC address */
/* Put the driver name into the request */
strncpy(req.ifr_name, "tap0", IFNAMSIZ);
/* Perform the ioctl to get the MAC address */
ret = ioctl(sockfd, SIOCGIFHWADDR, (unsigned long)&req);
if (!ret)
{
/* Set the MAC address */
ret = uipdriver_setmacaddr(&req.ifr_hwaddr.sa_data);
}
ret = uipdriver_setmacaddr(&req.ifr_hwaddr.sa_data);
}
}
return ret;
}