patch-2.1.14 linux/include/linux/if.h

Next file: linux/include/linux/in6.h
Previous file: linux/include/linux/icmpv6.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.13/linux/include/linux/if.h linux/include/linux/if.h
@@ -106,7 +106,7 @@
 		struct	sockaddr ifru_netmask;
 		struct  sockaddr ifru_hwaddr;
 		short	ifru_flags;
-		int	ifru_metric;
+		int	ifru_ivalue;
 		int	ifru_mtu;
 		struct  ifmap ifru_map;
 		char	ifru_slave[IFNAMSIZ];	/* Just fits the size */
@@ -121,11 +121,12 @@
 #define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address	*/
 #define	ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask	*/
 #define	ifr_flags	ifr_ifru.ifru_flags	/* flags		*/
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric		*/
+#define	ifr_metric	ifr_ifru.ifru_ivalue	/* metric		*/
 #define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu			*/
 #define ifr_map		ifr_ifru.ifru_map	/* device map		*/
 #define ifr_slave	ifr_ifru.ifru_slave	/* slave device		*/
 #define	ifr_data	ifr_ifru.ifru_data	/* for use by interface	*/
+#define ifr_ifindex	ifr_ifru.ifru_ivalue	/* interface index	*/
 
 /*
  * Structure used in SIOCGIFCONF request.

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov