diff options
| author | Lee Duncan <leeman.duncan@gmail.com> | 2018-03-22 10:41:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 10:41:11 -0700 |
| commit | 4f1fe471d254e81897ab14cb15da6120ff9be1e7 (patch) | |
| tree | be72c4f68aadc1047d7a1461ee5735bb797ad033 /iscsiuio/src | |
| parent | 273661c9c8d877f81d2096797bae6d95987b1d2e (diff) | |
| parent | 4b6d7bf59012a9d862468235535ea57276de76be (diff) | |
| download | open-iscsi-4f1fe471d254e81897ab14cb15da6120ff9be1e7.tar.gz | |
Merge pull request #89 from kraj/kraj/musl-fixes
musl build fixes
Diffstat (limited to 'iscsiuio/src')
| -rw-r--r-- | iscsiuio/src/unix/libs/bnx2x.c | 6 | ||||
| -rw-r--r-- | iscsiuio/src/unix/libs/qedi.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c index 3df6d5f..c5e7b71 100644 --- a/iscsiuio/src/unix/libs/bnx2x.c +++ b/iscsiuio/src/unix/libs/bnx2x.c @@ -36,6 +36,11 @@ * bnx2x.c - bnx2x user space driver * */ + +/* include nic.h before linux/ethtool.h to avoid redefinitions of + * eth structs +*/ +#include "nic.h" #include <errno.h> #include <stdio.h> #include <string.h> @@ -58,7 +63,6 @@ #include "bnx2x.h" #include "cnic.h" #include "logger.h" -#include "nic.h" #include "nic_id.h" #include "nic_utils.h" #include "options.h" diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c index b81fecd..24cb89a 100644 --- a/iscsiuio/src/unix/libs/qedi.c +++ b/iscsiuio/src/unix/libs/qedi.c @@ -49,7 +49,6 @@ #include <arpa/inet.h> #include <linux/types.h> #include <linux/sockios.h> -#include <linux/ethtool.h> #include <linux/netlink.h> #include <sys/mman.h> #include <sys/ioctl.h> |