First round of compile fixes for IPv6

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4813 7fd9a85b-ad96-42d3-883c-3090e2eb8679

2 files changed, 34 insertions, 20 deletions

diff --git a/nuttx/include/nuttx/fs/nfs.h b/nuttx/include/nuttx/fs/nfs.h
index 7f31da5a96..fcf9c3f7ba 100644
--- a/nuttx/include/nuttx/fs/nfs.h
+++ b/nuttx/include/nuttx/fs/nfs.h
@@ -63,26 +63,26 @@
 
 struct nfs_args
 {
-  uint8_t version;          /* Args structure version number */
-  uint8_t addrlen;          /* Length of address */
-  uint8_t sotype;           /* Socket type */
-  uint8_t proto;            /* and Protocol */
-  int     flags;            /* Flags */
-  int     wsize;            /* Write size in bytes */
-  int     rsize;            /* Read size in bytes */
-  int     readdirsize;      /* readdir size in bytes */
-  int     timeo;            /* Initial timeout in .1 secs */
-  int     retrans;          /* Times to retry send */
-//int     maxgrouplist;     /* Max. size of group list */
-//int     readahead;        /* # of blocks to readahead */
-//int     leaseterm;        /* Term (sec) of lease */
-//int     deadthresh;       /* Retrans threshold */
-  char   *path;             /* Server's path of the directory being mount */
-  int     acregmin;         /* Cache attrs for reg files min time */
-  int     acregmax;         /* Cache attrs for reg files max time */
-  int     acdirmin;         /* Cache attrs for dirs min time */
-  int     acdirmax;         /* Cache attrs for dirs max time */
-  struct  sockaddr addr;    /* File server address (requires 32-bit alignment) */
+  uint8_t version;               /* Args structure version number */
+  uint8_t addrlen;               /* Length of address */
+  uint8_t sotype;                /* Socket type */
+  uint8_t proto;                 /* and Protocol */
+  int     flags;                 /* Flags */
+  int     wsize;                 /* Write size in bytes */
+  int     rsize;                 /* Read size in bytes */
+  int     readdirsize;           /* readdir size in bytes */
+  int     timeo;                 /* Initial timeout in .1 secs */
+  int     retrans;               /* Times to retry send */
+//int     maxgrouplist;          /* Max. size of group list */
+//int     readahead;             /* # of blocks to readahead */
+//int     leaseterm;             /* Term (sec) of lease */
+//int     deadthresh;            /* Retrans threshold */
+  char   *path;                  /* Server's path of the directory being mount */
+  int     acregmin;              /* Cache attrs for reg files min time */
+  int     acregmax;              /* Cache attrs for reg files max time */
+  int     acdirmin;              /* Cache attrs for dirs min time */
+  int     acdirmax;              /* Cache attrs for dirs max time */
+  struct  sockaddr_storage addr; /* File server address (requires 32-bit alignment) */
 };
 
 /****************************************************************************
diff --git a/nuttx/include/nuttx/net/ioctl.h b/nuttx/include/nuttx/net/ioctl.h
index 4f8a49a7d6..5bce5eaf1c 100644
--- a/nuttx/include/nuttx/net/ioctl.h
+++ b/nuttx/include/nuttx/net/ioctl.h
@@ -71,6 +71,20 @@
 #define SIOCGIPMSFILTER  _SIOC(0x000e)  /* Retrieve source filter addresses */
 #define SIOCSIPMSFILTER  _SIOC(0x000f)  /* Set source filter content */
 
+/* Newer interface ioctls that use the struct lifreq. Can be used for
+ * both IPv4 and IPv6.
+ */
+
+#define SIOCGLIFADDR     SIOCGIFADDR    /* Get IP address */
+#define SIOCSLIFADDR     SIOCSIFADDR    /* Set IP address */
+#define SIOCGLIFDSTADDR  SIOCSIFDSTADDR /* Get P-to-P address */
+#define SIOCSLIFDSTADDR  SIOCSIFDSTADDR /* Set P-to-P address */
+#define SIOCGLIFBRDADDR  SIOCGIFBRDADDR /* Get broadcast IP address */
+#define SIOCSLIFBRDADDR  SIOCSIFBRDADDR /* Set broadcast IP address */
+#define SIOCGLIFNETMASK  SIOCGIFNETMASK /* Get network mask */
+#define SIOCSLIFNETMASK  SIOCSIFNETMASK /* Set network mask */
+#define SIOCGLIFMTU      SIOCGIFMTU     /* Get MTU size */
+
 /* Wireless ioctl commands **************************************************/
 
 #define SIOCSIWCOMMIT    _SIOC(0x0010)  /* Commit pending changes to driver */