svn commit: r316955 - in stable/11/sys: amd64/linux amd64/linux32 i386/linux

[Tai-hwa Liang]

Author: avatar
Date: Sat Apr 15 09:33:42 2017
New Revision: 316955
URL: https://svnweb.freebsd.org/changeset/base/316955

Log:
  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

Modified:
  stable/11/sys/amd64/linux/linux.h
  stable/11/sys/amd64/linux32/linux.h
  stable/11/sys/i386/linux/linux.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/linux/linux.h
==============================================================================
--- stable/11/sys/amd64/linux/linux.h	Sat Apr 15 07:32:57 2017	(r316954)
+++ stable/11/sys/amd64/linux/linux.h	Sat Apr 15 09:33:42 2017	(r316955)
@@ -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;

Modified: stable/11/sys/amd64/linux32/linux.h
==============================================================================
--- stable/11/sys/amd64/linux32/linux.h	Sat Apr 15 07:32:57 2017	(r316954)
+++ stable/11/sys/amd64/linux32/linux.h	Sat Apr 15 09:33:42 2017	(r316955)
@@ -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;

Modified: stable/11/sys/i386/linux/linux.h
==============================================================================
--- stable/11/sys/i386/linux/linux.h	Sat Apr 15 07:32:57 2017	(r316954)
+++ stable/11/sys/i386/linux/linux.h	Sat Apr 15 09:33:42 2017	(r316955)
@@ -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()