hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-20 23:54:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trying to be more compatible with Linux if.h definitions:

Browse Source 
- 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
MFC after:	1 week
This commit is contained in:
Tai-hwa Liang 2017-04-08 14:41:39 +00:00
parent 35d92e6cec
commit 7ece126ed8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=316644
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/linux/linux.h
View File

@ -412,7 +412,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];
@ -422,6 +422,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;

3
sys/amd64/linux32/linux.h
View File

@ -503,7 +503,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];
@ -513,6 +513,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;

3
sys/i386/linux/linux.h
View File

@ -482,7 +482,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];
@ -492,6 +492,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()