| Message ID | 1257530949-9695-2-git-send-email-arnd@arndb.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2009-11-06 at 19:09 +0100, Arnd Bergmann wrote: > +struct compat_ifreq { > +#define IFHWADDRLEN 6 > +#define IFNAMSIZ 16 > + union { > + char ifrn_name[IFNAMSIZ]; /* if name, > e.g. "en0" */ > + } ifr_ifrn; > + union { > + struct sockaddr ifru_addr; > + struct sockaddr ifru_dstaddr; > + struct sockaddr ifru_broadaddr; > + struct sockaddr ifru_netmask; > + struct sockaddr ifru_hwaddr; > + short ifru_flags; > + compat_int_t ifru_ivalue; > + compat_int_t ifru_mtu; > + struct compat_ifmap ifru_map; > + char ifru_slave[IFNAMSIZ]; /* Just fits the size > */ > + char ifru_newname[IFNAMSIZ]; > + compat_caddr_t ifru_data; > + /* XXXX? ifru_settings should be here */ > + } ifr_ifru; > +}; > + Did you just copy this from someplace else? Many of the lines seems to be tab damaged. Daniel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/compat.h b/include/linux/compat.h index af931ee..8311d2e 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -10,6 +10,8 @@ #include <linux/stat.h> #include <linux/param.h> /* for HZ */ #include <linux/sem.h> +#include <linux/socket.h> +#include <linux/if.h> #include <asm/compat.h> #include <asm/siginfo.h> @@ -154,6 +156,43 @@ typedef struct compat_sigevent { } _sigev_un; } compat_sigevent_t; +struct compat_ifmap { + compat_ulong_t mem_start; + compat_ulong_t mem_end; + unsigned short base_addr; + unsigned char irq; + unsigned char dma; + unsigned char port; +}; + +struct compat_ifreq { +#define IFHWADDRLEN 6 +#define IFNAMSIZ 16 + union { + char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ + } ifr_ifrn; + union { + struct sockaddr ifru_addr; + struct sockaddr ifru_dstaddr; + struct sockaddr ifru_broadaddr; + struct sockaddr ifru_netmask; + struct sockaddr ifru_hwaddr; + short ifru_flags; + compat_int_t ifru_ivalue; + compat_int_t ifru_mtu; + struct compat_ifmap ifru_map; + char ifru_slave[IFNAMSIZ]; /* Just fits the size */ + char ifru_newname[IFNAMSIZ]; + compat_caddr_t ifru_data; + /* XXXX? ifru_settings should be here */ + } ifr_ifru; +}; + +struct compat_ifconf { + compat_int_t ifc_len; /* size of buffer */ + compat_caddr_t ifcbuf; +}; + struct compat_robust_list { compat_uptr_t next; };
In order to move socket ioctl conversion code into multiple places in the socket code, we need a common defintion of the data structures it uses. Also change the name from ifreq32 to compat_ifreq to follow the naming convention for compat.h Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/compat.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-)