diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
commit | 9c34ad2933910aa02e387e161845fb64cad3b002 (patch) | |
tree | ef357700575b0fb1f2cb707dec6f8b3cbf669b22 /drivers/staging/rt2870/common/action.h | |
parent | 1e4467c780b7b7639bf3d713dc49a1a3b875c7c5 (diff) | |
parent | 48b83441aa08a72bb579872d2bf21734b0a26ce2 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rt2860/common/mlme.c
drivers/staging/rt2870/common/mlme.c
drivers/staging/rt3070/common/mlme.c
Diffstat (limited to 'drivers/staging/rt2870/common/action.h')
-rw-r--r-- | drivers/staging/rt2870/common/action.h | 69 |
1 files changed, 1 insertions, 68 deletions
diff --git a/drivers/staging/rt2870/common/action.h b/drivers/staging/rt2870/common/action.h index ce3877dce81b..9a1895525f30 100644 --- a/drivers/staging/rt2870/common/action.h +++ b/drivers/staging/rt2870/common/action.h @@ -1,68 +1 @@ -/* - ************************************************************************* - * Ralink Tech Inc. - * 5F., No.36, Taiyuan St., Jhubei City, - * Hsinchu County 302, - * Taiwan, R.O.C. - * - * (c) Copyright 2002-2007, Ralink Technology, Inc. - * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * * - ************************************************************************* - - Module Name: - aironet.h - - Abstract: - - Revision History: - Who When What - -------- ---------- ---------------------------------------------- - Name Date Modification logs - Paul Lin 04-06-15 Initial -*/ - -#ifndef __ACTION_H__ -#define __ACTION_H__ - -typedef struct PACKED __HT_INFO_OCTET -{ -#ifdef RT_BIG_ENDIAN - UCHAR Reserved:5; - UCHAR STA_Channel_Width:1; - UCHAR Forty_MHz_Intolerant:1; - UCHAR Request:1; -#else - UCHAR Request:1; - UCHAR Forty_MHz_Intolerant:1; - UCHAR STA_Channel_Width:1; - UCHAR Reserved:5; -#endif -} HT_INFORMATION_OCTET; - - -typedef struct PACKED __FRAME_HT_INFO -{ - HEADER_802_11 Hdr; - UCHAR Category; - UCHAR Action; - HT_INFORMATION_OCTET HT_Info; -} FRAME_HT_INFO, *PFRAME_HT_INFO; - -#endif /* __ACTION_H__ */ - - +#include "../../rt2860/common/action.h" |