Commit b4fcc8a2 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192su/ieee80211: switch to use <linux/ieee80211.h> 



* s/WLAN_AUTH_LEAP/RTL_WLAN_AUTH_LEAP/g
* s/struct ieee80211_hdr/struct rtl_ieee80211_hdr/g
* switch to use <linux/ieee80211.h>

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 68da8fcd

drivers/staging/rtl8192su/ieee80211/ieee80211.h

+4 −127
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 




#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/wireless.h>

#include <linux/wireless.h>

#include <linux/ieee80211.h>





#include "rtl819x_HT.h"

#include "rtl819x_HT.h"

#include "rtl819x_BA.h"

#include "rtl819x_BA.h"
@@ -392,62 +393,19 @@ typedef struct ieee_param { 








/* Frame control field constants */

/* Frame control field constants */

#define IEEE80211_FCTL_VERS		0x0003

#define IEEE80211_FCTL_FTYPE		0x000c

#define IEEE80211_FCTL_STYPE		0x00f0

#define IEEE80211_FCTL_FRAMETYPE	0x00fc

#define IEEE80211_FCTL_FRAMETYPE	0x00fc

#define IEEE80211_FCTL_TODS		0x0100

#define IEEE80211_FCTL_FROMDS		0x0200

#define IEEE80211_FCTL_DSTODS		0x0300 //added by david

#define IEEE80211_FCTL_DSTODS		0x0300 //added by david

#define IEEE80211_FCTL_MOREFRAGS	0x0400

#define IEEE80211_FCTL_RETRY		0x0800

#define IEEE80211_FCTL_PM		0x1000

#define IEEE80211_FCTL_MOREDATA		0x2000

#define IEEE80211_FCTL_WEP		0x4000

#define IEEE80211_FCTL_WEP		0x4000

#define IEEE80211_FCTL_ORDER		0x8000



#define IEEE80211_FTYPE_MGMT		0x0000

#define IEEE80211_FTYPE_CTL		0x0004

#define IEEE80211_FTYPE_DATA		0x0008





/* management */

/* management */

#define IEEE80211_STYPE_ASSOC_REQ	0x0000

#define IEEE80211_STYPE_ASSOC_RESP 	0x0010

#define IEEE80211_STYPE_REASSOC_REQ	0x0020

#define IEEE80211_STYPE_REASSOC_RESP	0x0030

#define IEEE80211_STYPE_PROBE_REQ	0x0040

#define IEEE80211_STYPE_PROBE_RESP	0x0050

#define IEEE80211_STYPE_BEACON		0x0080

#define IEEE80211_STYPE_ATIM		0x0090

#define IEEE80211_STYPE_DISASSOC	0x00A0

#define IEEE80211_STYPE_AUTH		0x00B0

#define IEEE80211_STYPE_DEAUTH		0x00C0

#define IEEE80211_STYPE_MANAGE_ACT	0x00D0

#define IEEE80211_STYPE_MANAGE_ACT	0x00D0





/* control */

/* control */

#define IEEE80211_STYPE_PSPOLL		0x00A0

#define IEEE80211_STYPE_RTS		0x00B0

#define IEEE80211_STYPE_CTS		0x00C0

#define IEEE80211_STYPE_ACK		0x00D0

#define IEEE80211_STYPE_CFEND		0x00E0

#define IEEE80211_STYPE_CFENDACK	0x00F0

#define IEEE80211_STYPE_BLOCKACK   0x0094

#define IEEE80211_STYPE_BLOCKACK   0x0094





/* data */

/* data */

#define IEEE80211_STYPE_DATA		0x0000

#define IEEE80211_STYPE_DATA_CFACK	0x0010

#define IEEE80211_STYPE_DATA_CFPOLL	0x0020

#define IEEE80211_STYPE_DATA_CFACKPOLL	0x0030

#define IEEE80211_STYPE_NULLFUNC	0x0040

#define IEEE80211_STYPE_CFACK		0x0050

#define IEEE80211_STYPE_CFPOLL		0x0060

#define IEEE80211_STYPE_CFACKPOLL	0x0070

#define IEEE80211_STYPE_QOS_DATA	0x0080 //added for WMM 2006/8/2

#define IEEE80211_STYPE_QOS_NULL	0x00C0

#define IEEE80211_STYPE_QOS_NULL	0x00C0





#define IEEE80211_SCTL_FRAG		0x000F

#define IEEE80211_SCTL_SEQ		0xFFF0



/* QOS control */

/* QOS control */

#define IEEE80211_QCTL_TID              0x000F

#define IEEE80211_QCTL_TID              0x000F
@@ -667,93 +625,12 @@ struct ieee80211_snap_hdr { 
#define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)

#define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)

#define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)





/* Authentication algorithms */

#define RTL_WLAN_AUTH_LEAP 2

#define WLAN_AUTH_OPEN 0

#define WLAN_AUTH_SHARED_KEY 1

#define WLAN_AUTH_LEAP 2





#define WLAN_AUTH_CHALLENGE_LEN 128

#define WLAN_AUTH_CHALLENGE_LEN 128





#define WLAN_CAPABILITY_BSS (1<<0)

#define WLAN_CAPABILITY_BSS (1<<0)

#define WLAN_CAPABILITY_IBSS (1<<1)

#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)

#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)

#define WLAN_CAPABILITY_PRIVACY (1<<4)

#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)

#define WLAN_CAPABILITY_PBCC (1<<6)

#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)

#define WLAN_CAPABILITY_SPECTRUM_MGMT (1<<8)

#define WLAN_CAPABILITY_QOS (1<<9)

#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)

#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)

#define WLAN_CAPABILITY_DSSS_OFDM (1<<13)



/* 802.11g ERP information element */

#define WLAN_ERP_NON_ERP_PRESENT (1<<0)

#define WLAN_ERP_USE_PROTECTION (1<<1)

#define WLAN_ERP_BARKER_PREAMBLE (1<<2)



/* Status codes */

enum ieee80211_statuscode {

        WLAN_STATUS_SUCCESS = 0,

        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,

        WLAN_STATUS_CAPS_UNSUPPORTED = 10,

        WLAN_STATUS_REASSOC_NO_ASSOC = 11,

        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,

        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,

        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,

        WLAN_STATUS_CHALLENGE_FAIL = 15,

        WLAN_STATUS_AUTH_TIMEOUT = 16,

        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,

        WLAN_STATUS_ASSOC_DENIED_RATES = 18,

        /* 802.11b */

        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,

        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,

        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,

        /* 802.11h */

        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,

        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,

        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,

        /* 802.11g */

        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,

        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,

        /* 802.11i */

        WLAN_STATUS_INVALID_IE = 40,

        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,

        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,

        WLAN_STATUS_INVALID_AKMP = 43,

        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,

        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,

        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,

};



/* Reason codes */

enum ieee80211_reasoncode {

        WLAN_REASON_UNSPECIFIED = 1,

        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,

        WLAN_REASON_DEAUTH_LEAVING = 3,

        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,

        WLAN_REASON_DISASSOC_AP_BUSY = 5,

        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,

        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,

        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,

        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,

        /* 802.11h */

        WLAN_REASON_DISASSOC_BAD_POWER = 10,

        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,

        /* 802.11i */

        WLAN_REASON_INVALID_IE = 13,

        WLAN_REASON_MIC_FAILURE = 14,

        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,

        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,

        WLAN_REASON_IE_DIFFERENT = 17,

        WLAN_REASON_INVALID_GROUP_CIPHER = 18,

        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,

        WLAN_REASON_INVALID_AKMP = 20,

        WLAN_REASON_UNSUPP_RSN_VERSION = 21,

        WLAN_REASON_INVALID_RSN_IE_CAP = 22,

        WLAN_REASON_IEEE8021X_FAILED = 23,

        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,

};





#define IEEE80211_STATMASK_SIGNAL (1<<0)

#define IEEE80211_STATMASK_SIGNAL (1<<0)

#define IEEE80211_STATMASK_RSSI (1<<1)

#define IEEE80211_STATMASK_RSSI (1<<1)
@@ -1044,7 +921,7 @@ enum ieee80211_mfie { 
/* Minimal header; can be used for passing 802.11 frames with sufficient

/* Minimal header; can be used for passing 802.11 frames with sufficient

 * information to determine what type of underlying data type is actually

 * information to determine what type of underlying data type is actually

 * stored in the data. */

 * stored in the data. */

struct ieee80211_hdr {

struct rtl_ieee80211_hdr {

        __le16 frame_ctl;

        __le16 frame_ctl;

        __le16 duration_id;

        __le16 duration_id;

        u8 payload[0];

        u8 payload[0];
@@ -2412,7 +2289,7 @@ extern inline int ieee80211_get_hdrlen(u16 fc) 
	return hdrlen;

	return hdrlen;

}

}





static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)

static inline u8 *ieee80211_get_payload(struct rtl_ieee80211_hdr *hdr)

{

{

        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {

        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {

        case IEEE80211_1ADDR_LEN:

        case IEEE80211_1ADDR_LEN:

drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2014,7 +2014,8 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success) 
}

}

void ieee80211_process_action(struct ieee80211_device* ieee, struct sk_buff* skb)

void ieee80211_process_action(struct ieee80211_device* ieee, struct sk_buff* skb)

{

{

	struct ieee80211_hdr* header = (struct ieee80211_hdr*)skb->data;

	struct rtl_ieee80211_hdr *header =

		(struct rtl_ieee80211_hdr *)skb->data;

	u8* act = ieee80211_get_payload(header);

	u8* act = ieee80211_get_payload(header);

	u8 tmp = 0;

	u8 tmp = 0;

//	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len);

//	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len);
@@ -3036,7 +3037,7 @@ static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value) 
		ieee->auth_mode = 0;

		ieee->auth_mode = 0;

	}

	}

	else if (value & AUTH_ALG_LEAP){

	else if (value & AUTH_ALG_LEAP){

		sec.auth_mode = WLAN_AUTH_LEAP;

		sec.auth_mode = RTL_WLAN_AUTH_LEAP;

		ieee->open_wep = 1;

		ieee->open_wep = 1;

		ieee->auth_mode = 2;

		ieee->auth_mode = 2;

	}

	}

drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -193,11 +193,11 @@ int ieee80211_encrypt_fragment( 
		return -1;

		return -1;

	}

	}

#ifdef CONFIG_IEEE80211_CRYPT_TKIP

#ifdef CONFIG_IEEE80211_CRYPT_TKIP

	struct ieee80211_hdr *header;

	struct rtl_ieee80211_hdr *header;





	if (ieee->tkip_countermeasures &&

	if (ieee->tkip_countermeasures &&

	    crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {

	    crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {

		header = (struct ieee80211_hdr *) frag->data;

		header = (struct rtl_ieee80211_hdr *)frag->data;

		if (net_ratelimit()) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "

			printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "

			       "TX packet to " MAC_FMT "\n",

			       "TX packet to " MAC_FMT "\n",