WEXT: Use linux/wireless.h instead of wireless_copy.h
WEXT is not really changing anymore and more or less all Linux distros come with linux/wireless.h that is recent enough to allow the driver wrappers to be build. Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
		
							parent
							
								
									7cb03b0eaf
								
							
						
					
					
						commit
						545cfc4bf3
					
				
					 6 changed files with 47 additions and 1187 deletions
				
			
		|  | @ -45,7 +45,7 @@ | |||
| #endif | ||||
| #endif /* CONFIG_WPS */ | ||||
| 
 | ||||
| #include "wireless_copy.h" | ||||
| #include "linux_wext.h" | ||||
| 
 | ||||
| #include "driver.h" | ||||
| #include "eloop.h" | ||||
|  |  | |||
|  | @ -15,7 +15,7 @@ | |||
| #include "includes.h" | ||||
| #include <sys/ioctl.h> | ||||
| 
 | ||||
| #include "wireless_copy.h" | ||||
| #include "linux_wext.h" | ||||
| #include "common.h" | ||||
| #include "driver.h" | ||||
| #include "driver_wext.h" | ||||
|  |  | |||
|  | @ -27,7 +27,7 @@ | |||
| #include "driver_wext.h" | ||||
| #include "eloop.h" | ||||
| #include "common/ieee802_11_defs.h" | ||||
| #include "wireless_copy.h" | ||||
| #include "linux_wext.h" | ||||
| 
 | ||||
| /*
 | ||||
|  * Avoid conflicts with wpa_supplicant definitions by undefining a definition. | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ | |||
| #include <fcntl.h> | ||||
| #include <net/if_arp.h> | ||||
| 
 | ||||
| #include "wireless_copy.h" | ||||
| #include "linux_wext.h" | ||||
| #include "common.h" | ||||
| #include "eloop.h" | ||||
| #include "common/ieee802_11_defs.h" | ||||
|  |  | |||
							
								
								
									
										43
									
								
								src/drivers/linux_wext.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								src/drivers/linux_wext.h
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,43 @@ | |||
| /*
 | ||||
|  * Driver interaction with generic Linux Wireless Extensions | ||||
|  * Copyright (c) 2003-2011, Jouni Malinen <j@w1.fi> | ||||
|  * | ||||
|  * This program is free software; you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License version 2 as | ||||
|  * published by the Free Software Foundation. | ||||
|  * | ||||
|  * Alternatively, this software may be distributed under the terms of BSD | ||||
|  * license. | ||||
|  * | ||||
|  * See README and COPYING for more details. | ||||
|  */ | ||||
| 
 | ||||
| #ifndef LINUX_WEXT_H | ||||
| #define LINUX_WEXT_H | ||||
| 
 | ||||
| #ifndef ANDROID | ||||
| 
 | ||||
| /*
 | ||||
|  * Avoid including other kernel header to avoid conflicts with C library | ||||
|  * headers. | ||||
|  */ | ||||
| #define _LINUX_TYPES_H | ||||
| #define _LINUX_SOCKET_H | ||||
| #define _LINUX_IF_H | ||||
| 
 | ||||
| #include <sys/types.h> | ||||
| #include <net/if.h> | ||||
| typedef __uint32_t __u32; | ||||
| typedef __int32_t __s32; | ||||
| typedef __uint16_t __u16; | ||||
| typedef __int16_t __s16; | ||||
| typedef __uint8_t __u8; | ||||
| #ifndef __user | ||||
| #define __user | ||||
| #endif /* __user */ | ||||
| 
 | ||||
| #endif /* ANDROID */ | ||||
| 
 | ||||
| #include <linux/wireless.h> | ||||
| 
 | ||||
| #endif /* LINUX_WEXT_H */ | ||||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
		Loading…
	
		Reference in a new issue
	
	 Jouni Malinen
						Jouni Malinen