diff options
Diffstat (limited to 'include/linux/if.h')
| -rw-r--r-- | include/linux/if.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index ffa226a62..06e2d740e 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -19,7 +19,7 @@ #ifndef _LINUX_IF_H #define _LINUX_IF_H -#include <linux/types.h> /* for "caddr_t" et al */ +#include <linux/types.h> /* for "__kernel_caddr_t" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */ /* Standard interface flags. */ @@ -32,7 +32,6 @@ #define IFF_RUNNING 0x40 /* resources allocated */ #define IFF_NOARP 0x80 /* no ARP protocol */ #define IFF_PROMISC 0x100 /* receive all packets */ -/* Not supported */ #define IFF_ALLMULTI 0x200 /* receive all multicast packets*/ #define IFF_MASTER 0x400 /* master of a load balancer */ @@ -110,7 +109,7 @@ struct ifreq int ifru_mtu; struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; /* Just fits the size */ - caddr_t ifru_data; + __kernel_caddr_t ifru_data; } ifr_ifru; }; @@ -140,8 +139,8 @@ struct ifconf int ifc_len; /* size of buffer */ union { - caddr_t ifcu_buf; - struct ifreq *ifcu_req; + __kernel_caddr_t ifcu_buf; + struct ifreq *ifcu_req; } ifc_ifcu; }; #define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ |