patch-2.1.127 linux/include/linux/if.h
Next file: linux/include/linux/kernel.h
Previous file: linux/include/linux/cdrom.h
Back to the patch index
Back to the overall index
- Lines: 38
- Date:
Sat Nov 7 11:00:31 1998
- Orig file:
v2.1.126/linux/include/linux/if.h
- Orig date:
Sat Sep 5 16:46:41 1998
diff -u --recursive --new-file v2.1.126/linux/include/linux/if.h linux/include/linux/if.h
@@ -43,7 +43,9 @@
#define IFF_PORTSEL 0x2000 /* can set media type */
#define IFF_AUTOMEDIA 0x4000 /* auto media select active */
-#define IFF_NODYNARP 0x8000 /* use static ARP only (HIPPI) */
+#define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses*/
+
+#ifdef __KERNEL__
/*
* The ifaddr structure contains information about one address
* of an interface. They are maintained by the different address
@@ -66,6 +68,8 @@
#define ifa_broadaddr ifa_ifu.ifu_broadaddr /* broadcast address */
#define ifa_dstaddr ifa_ifu.ifu_dstaddr /* other end of link */
+#endif /* __KERNEL__ */
+
/*
* Device mapping structure. I'd just gone off and designed a
* beautiful scheme using only loadable modules with arguments
@@ -115,7 +119,7 @@
struct ifmap ifru_map;
char ifru_slave[IFNAMSIZ]; /* Just fits the size */
char ifru_newname[IFNAMSIZ];
- __kernel_caddr_t ifru_data;
+ char * ifru_data;
} ifr_ifru;
};
@@ -148,7 +152,7 @@
int ifc_len; /* size of buffer */
union
{
- __kernel_caddr_t ifcu_buf;
+ char * ifcu_buf;
struct ifreq *ifcu_req;
} ifc_ifcu;
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov