diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/80211mgr.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/80211mgr.h')
-rw-r--r-- | drivers/staging/vt6655/80211mgr.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h index dc54a65..5efc132 100644 --- a/drivers/staging/vt6655/80211mgr.h +++ b/drivers/staging/vt6655/80211mgr.h @@ -16,10 +16,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * File: 80211mgr.h * - * Purpose: Defines the macros, types, and functions for dealing - * with 802.11 managment frames. + * Purpose: 802.11 managment frames pre-defines. + * * * Author: Lyndon Chen * @@ -27,17 +28,11 @@ * */ - #ifndef __80211MGR_H__ #define __80211MGR_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211HDR_H__) #include "80211hdr.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -273,7 +268,6 @@ typedef struct _WLAN_IE_FH_PARMS { BYTE byHopIndex; } WLAN_IE_FH_PARMS, *PWLAN_IE_FH_PARMS; - // DS Parameter Set #pragma pack(1) typedef struct tagWLAN_IE_DS_PARMS { @@ -719,6 +713,7 @@ typedef struct tagWLAN_FR_DEAUTHEN { } WLAN_FR_DEAUTHEN, *PWLAN_FR_DEAUTHEN; /*--------------------- Export Functions --------------------------*/ + VOID vMgrEncodeBeacon( IN PWLAN_FR_BEACON pFrame |