diff options
author | avatar <avatar@FreeBSD.org> | 2017-04-15 09:33:42 +0000 |
---|---|---|
committer | avatar <avatar@FreeBSD.org> | 2017-04-15 09:33:42 +0000 |
commit | 21382a2b98c257da842adc1f651f3e207dd235af (patch) | |
tree | 29749a404c1505d9019b6df50a3991e6e88ef427 /sys | |
parent | 538996dc06eb821c841b6c90813605770644f7f9 (diff) | |
download | FreeBSD-src-21382a2b98c257da842adc1f651f3e207dd235af.zip FreeBSD-src-21382a2b98c257da842adc1f651f3e207dd235af.tar.gz |
MFC 316644:
Trying to be more compatible with Linux if.h definitions:
- renaming l_ifreq::ifru_metric to l_ifreq::ifru_ivalue;
- adding a definition for ifr_ifindex which points to l_ifreq::ifru_ivalue.
A quick search indicates that Linux already got the above changes since 2.1.14.
Reviewed by: kib, marcel, dchagin
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/linux/linux.h | 3 | ||||
-rw-r--r-- | sys/amd64/linux32/linux.h | 3 | ||||
-rw-r--r-- | sys/i386/linux/linux.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index b30568f..8155216 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -464,7 +464,7 @@ struct l_ifreq { struct l_sockaddr ifru_netmask; struct l_sockaddr ifru_hwaddr; l_short ifru_flags[1]; - l_int ifru_metric; + l_int ifru_ivalue; l_int ifru_mtu; struct l_ifmap ifru_map; char ifru_slave[LINUX_IFNAMSIZ]; @@ -474,6 +474,7 @@ struct l_ifreq { #define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ struct l_ifconf { int ifc_len; diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 29f83a3..bf800ec 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -544,7 +544,7 @@ struct l_ifreq { struct l_sockaddr ifru_netmask; struct l_sockaddr ifru_hwaddr; l_short ifru_flags[1]; - l_int ifru_metric; + l_int ifru_ivalue; l_int ifru_mtu; struct l_ifmap ifru_map; char ifru_slave[LINUX_IFNAMSIZ]; @@ -554,6 +554,7 @@ struct l_ifreq { #define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ struct l_ifconf { int ifc_len; diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 0833067..9493b0a 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -523,7 +523,7 @@ struct l_ifreq { struct l_sockaddr ifru_netmask; struct l_sockaddr ifru_hwaddr; l_short ifru_flags[1]; - l_int ifru_metric; + l_int ifru_ivalue; l_int ifru_mtu; struct l_ifmap ifru_map; char ifru_slave[LINUX_IFNAMSIZ]; @@ -533,6 +533,7 @@ struct l_ifreq { #define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* Interface index */ /* * poll() |