Skip to content

Correct compilation of arch/sim/src/sim/up_wpcap.c #1903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btashton merged 1 commit into from
Sep 28, 2020
Merged

Correct compilation of arch/sim/src/sim/up_wpcap.c #1903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions arch/sim/src/sim/up_wpcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
#include <syslog.h>
#include <malloc.h>

#include <netinet/in.h>

#include "up_internal.h"

/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
Expand All @@ -68,6 +64,17 @@
# define WCAP_IPADDR (0)
#endif

/****************************************************************************
* Private Types
****************************************************************************/

/* This is normally prototyped in up_internal.h. However, up_internal.h
* cannot be included by this file do to collisions between BSD networking
* definitions and Windows network definitions.
*/

void netdriver_setmacaddr(unsigned char *macaddr);

/****************************************************************************
* Private Types
****************************************************************************/
Expand Down Expand Up @@ -150,7 +157,7 @@ static void init_pcap(struct in_addr addr)
struct in_addr interface_addr;
interface_addr =
((struct sockaddr_in *)interfaces->addresses->addr)->sin_addr;
syslog(LOG_INFO, ("init_pcap: with address: %s\n",
syslog(LOG_INFO, "init_pcap: with address: %s\n",
inet_ntoa(interface_addr));

if (interface_addr.s_addr == addr.s_addr)
Expand Down Expand Up @@ -228,7 +235,7 @@ static void set_ethaddr(struct in_addr addr)
adapters->PhysicalAddress[2], adapters->PhysicalAddress[3],
adapters->PhysicalAddress[4], adapters->PhysicalAddress[5]);

netdriver_setmacaddr(adapters->PhysicalAddress);
netdriver_setmacaddr(adapters->PhysicalAddress);
break;
}
}
Expand Down