mirror of
https://github.com/apache/nuttx.git
synced 2026-05-31 14:27:37 +08:00
net/ethernet: change struct ifreq to consistent with Linux
In order to fix compilation issue, the struct ifreq structure is modified. Signed-off-by: gaohedong <gaohedong@xiaomi.com>
This commit is contained in:
+10
-2
@@ -240,7 +240,6 @@ struct can_ioctl_state_s
|
|||||||
struct lifreq
|
struct lifreq
|
||||||
{
|
{
|
||||||
char lifr_name[IFNAMSIZ]; /* Network device name (e.g. "eth0") */
|
char lifr_name[IFNAMSIZ]; /* Network device name (e.g. "eth0") */
|
||||||
int16_t lifr_ifindex; /* Interface index */
|
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct sockaddr_storage lifru_addr; /* IP Address */
|
struct sockaddr_storage lifru_addr; /* IP Address */
|
||||||
@@ -249,6 +248,7 @@ struct lifreq
|
|||||||
struct sockaddr_storage lifru_netmask; /* Netmask */
|
struct sockaddr_storage lifru_netmask; /* Netmask */
|
||||||
struct sockaddr lifru_hwaddr; /* MAC address */
|
struct sockaddr lifru_hwaddr; /* MAC address */
|
||||||
int lifru_count; /* Number of devices */
|
int lifru_count; /* Number of devices */
|
||||||
|
int lifru_ivalue; /* Value for ifindex/metric/bandwidth and so on */
|
||||||
int lifru_mtu; /* MTU size */
|
int lifru_mtu; /* MTU size */
|
||||||
uint32_t lifru_flags; /* Interface flags */
|
uint32_t lifru_flags; /* Interface flags */
|
||||||
struct mii_ioctl_notify_s llfru_mii_notify; /* PHY event notification */
|
struct mii_ioctl_notify_s llfru_mii_notify; /* PHY event notification */
|
||||||
@@ -264,6 +264,10 @@ struct lifreq
|
|||||||
#define lifr_broadaddr lifr_ifru.lifru_broadaddr /* Broadcast address */
|
#define lifr_broadaddr lifr_ifru.lifru_broadaddr /* Broadcast address */
|
||||||
#define lifr_netmask lifr_ifru.lifru_netmask /* Interface net mask */
|
#define lifr_netmask lifr_ifru.lifru_netmask /* Interface net mask */
|
||||||
#define lifr_hwaddr lifr_ifru.lifru_hwaddr /* MAC address */
|
#define lifr_hwaddr lifr_ifru.lifru_hwaddr /* MAC address */
|
||||||
|
#define lifr_ifindex lifr_ifru.lifru_ivalue /* Interface index */
|
||||||
|
#define lifr_metric lifr_ifru.lifru_ivalue /* metric */
|
||||||
|
#define lifr_bandwidth lifr_ifru.lifru_ivalue /* link bandwidth */
|
||||||
|
#define lifr_qlen lifr_ifru.lifru_ivalue /* Queue length */
|
||||||
#define lifr_mtu lifr_ifru.lifru_mtu /* MTU */
|
#define lifr_mtu lifr_ifru.lifru_mtu /* MTU */
|
||||||
#define lifr_count lifr_ifru.lifru_count /* Number of devices */
|
#define lifr_count lifr_ifru.lifru_count /* Number of devices */
|
||||||
#define lifr_flags lifr_ifru.lifru_flags /* interface flags */
|
#define lifr_flags lifr_ifru.lifru_flags /* interface flags */
|
||||||
@@ -294,7 +298,6 @@ struct lifconf
|
|||||||
struct ifreq
|
struct ifreq
|
||||||
{
|
{
|
||||||
char ifr_name[IFNAMSIZ]; /* Network device name (e.g. "eth0") */
|
char ifr_name[IFNAMSIZ]; /* Network device name (e.g. "eth0") */
|
||||||
int16_t ifr_ifindex; /* Interface index */
|
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct sockaddr ifru_addr; /* IP Address */
|
struct sockaddr ifru_addr; /* IP Address */
|
||||||
@@ -303,6 +306,7 @@ struct ifreq
|
|||||||
struct sockaddr ifru_netmask; /* Netmask */
|
struct sockaddr ifru_netmask; /* Netmask */
|
||||||
struct sockaddr ifru_hwaddr; /* MAC address */
|
struct sockaddr ifru_hwaddr; /* MAC address */
|
||||||
int ifru_count; /* Number of devices */
|
int ifru_count; /* Number of devices */
|
||||||
|
int ifru_ivalue; /* Value for ifindex/metric/bandwidth and so on */
|
||||||
int ifru_mtu; /* MTU size */
|
int ifru_mtu; /* MTU size */
|
||||||
uint32_t ifru_flags; /* Interface flags */
|
uint32_t ifru_flags; /* Interface flags */
|
||||||
struct mii_ioctl_notify_s ifru_mii_notify; /* PHY event notification */
|
struct mii_ioctl_notify_s ifru_mii_notify; /* PHY event notification */
|
||||||
@@ -319,6 +323,10 @@ struct ifreq
|
|||||||
#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* Broadcast address */
|
#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* Broadcast address */
|
||||||
#define ifr_netmask ifr_ifru.ifru_netmask /* Interface net mask */
|
#define ifr_netmask ifr_ifru.ifru_netmask /* Interface net mask */
|
||||||
#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
|
#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
|
||||||
|
#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */
|
||||||
|
#define ifr_metric ifr_ifru.ifru_ivalue /* metric */
|
||||||
|
#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */
|
||||||
|
#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */
|
||||||
#define ifr_mtu ifr_ifru.ifru_mtu /* MTU */
|
#define ifr_mtu ifr_ifru.ifru_mtu /* MTU */
|
||||||
#define ifr_count ifr_ifru.ifru_count /* Number of devices */
|
#define ifr_count ifr_ifru.ifru_count /* Number of devices */
|
||||||
#define ifr_flags ifr_ifru.ifru_flags /* interface flags */
|
#define ifr_flags ifr_ifru.ifru_flags /* interface flags */
|
||||||
|
|||||||
Reference in New Issue
Block a user