|
@@ -493,8 +493,8 @@ typedef struct ieee_param {
|
|
|
#define IsDataFrame(pdu) ( ((pdu[0] & 0x0C)==0x08) ? true : false )
|
|
|
#define IsLegacyDataFrame(pdu) (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT)) )
|
|
|
//added by wb. Is this right?
|
|
|
-#define IsQoSDataFrame(pframe) ((*(u16*)pframe&(IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA)) == (IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA))
|
|
|
-#define Frame_Order(pframe) (*(u16*)pframe&IEEE80211_FCTL_ORDER)
|
|
|
+#define IsQoSDataFrame(pframe) ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA)) == (IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA))
|
|
|
+#define Frame_Order(pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER)
|
|
|
#define SN_LESS(a, b) (((a-b)&0x800)!=0)
|
|
|
#define SN_EQUAL(a, b) (a == b)
|
|
|
#define MAX_DEV_ADDR_SIZE 8
|
|
@@ -538,7 +538,7 @@ do { if (ieee80211_debug_level & (level)) \
|
|
|
do{ if ((ieee80211_debug_level & (level)) == (level)) \
|
|
|
{ \
|
|
|
int i; \
|
|
|
- u8* pdata = (u8*) data; \
|
|
|
+ u8 *pdata = (u8 *) data; \
|
|
|
printk(KERN_DEBUG "ieee80211: %s()\n", __FUNCTION__); \
|
|
|
for(i=0; i<(int)(datalen); i++) \
|
|
|
{ \
|
|
@@ -914,7 +914,7 @@ struct ieee80211_rx_stats {
|
|
|
bool bIsCCK;
|
|
|
bool bPacketToSelf;
|
|
|
//added by amy
|
|
|
- u8* virtual_address;
|
|
|
+ u8 *virtual_address;
|
|
|
u16 packetlength; // Total packet length: Must equal to sum of all FragLength
|
|
|
u16 fraglength; // FragLength should equal to PacketLength in non-fragment case
|
|
|
u16 fragoffset; // Data offset for this fragment
|
|
@@ -1366,13 +1366,13 @@ static inline const char *eap_get_type(int type)
|
|
|
return ((u32)type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type];
|
|
|
}
|
|
|
//added by amy for reorder
|
|
|
-static inline u8 Frame_QoSTID(u8* buf)
|
|
|
+static inline u8 Frame_QoSTID(u8 *buf)
|
|
|
{
|
|
|
struct ieee80211_hdr_3addr *hdr;
|
|
|
u16 fc;
|
|
|
hdr = (struct ieee80211_hdr_3addr *)buf;
|
|
|
fc = le16_to_cpu(hdr->frame_ctl);
|
|
|
- return (u8)((frameqos*)(buf + (((fc & IEEE80211_FCTL_TODS)&&(fc & IEEE80211_FCTL_FROMDS))? 30 : 24)))->field.tid;
|
|
|
+ return (u8)((frameqos *)(buf + (((fc & IEEE80211_FCTL_TODS)&&(fc & IEEE80211_FCTL_FROMDS))? 30 : 24)))->field.tid;
|
|
|
}
|
|
|
|
|
|
//added by amy for reorder
|
|
@@ -1670,7 +1670,7 @@ typedef struct _bandwidth_autoswitch {
|
|
|
typedef struct _RX_REORDER_ENTRY {
|
|
|
struct list_head List;
|
|
|
u16 SeqNum;
|
|
|
- struct ieee80211_rxb* prxb;
|
|
|
+ struct ieee80211_rxb *prxb;
|
|
|
} RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;
|
|
|
//added by amy for order
|
|
|
typedef enum _Fsync_State{
|
|
@@ -1965,7 +1965,7 @@ struct ieee80211_device {
|
|
|
|
|
|
/* map of allowed channels. 0 is dummy */
|
|
|
// FIXME: remember to default to a basic channel plan depending of the PHY type
|
|
|
- void* pDot11dInfo;
|
|
|
+ void *pDot11dInfo;
|
|
|
bool bGlobalDomain;
|
|
|
int rate; /* current rate */
|
|
|
int basic_rate;
|
|
@@ -2107,10 +2107,10 @@ struct ieee80211_device {
|
|
|
struct net_device *dev);
|
|
|
|
|
|
int (*reset_port)(struct net_device *dev);
|
|
|
- int (*is_queue_full) (struct net_device * dev, int pri);
|
|
|
+ int (*is_queue_full) (struct net_device *dev, int pri);
|
|
|
|
|
|
- int (*handle_management) (struct net_device * dev,
|
|
|
- struct ieee80211_network * network, u16 type);
|
|
|
+ int (*handle_management) (struct net_device *dev,
|
|
|
+ struct ieee80211_network *network, u16 type);
|
|
|
int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
|
|
|
|
|
|
/* Softmac-generated frames (management) are TXed via this
|
|
@@ -2187,8 +2187,8 @@ struct ieee80211_device {
|
|
|
void (*ps_request_tx_ack) (struct net_device *dev);
|
|
|
void (*enter_sleep_state) (struct net_device *dev, u32 th, u32 tl);
|
|
|
short (*ps_is_queue_empty) (struct net_device *dev);
|
|
|
- int (*handle_beacon) (struct net_device * dev, struct ieee80211_beacon * beacon, struct ieee80211_network * network);
|
|
|
- int (*handle_assoc_response) (struct net_device * dev, struct ieee80211_assoc_response_frame * resp, struct ieee80211_network * network);
|
|
|
+ int (*handle_beacon) (struct net_device *dev, struct ieee80211_beacon *beacon, struct ieee80211_network *network);
|
|
|
+ int (*handle_assoc_response) (struct net_device *dev, struct ieee80211_assoc_response_frame *resp, struct ieee80211_network *network);
|
|
|
|
|
|
|
|
|
/* check whether Tx hw resource available */
|
|
@@ -2197,9 +2197,9 @@ struct ieee80211_device {
|
|
|
// void (*SwChnlByTimerHandler)(struct net_device *dev, int channel);
|
|
|
void (*SetBWModeHandler)(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
|
|
// void (*UpdateHalRATRTableHandler)(struct net_device* dev, u8* pMcsRate);
|
|
|
- bool (*GetNmodeSupportBySecCfg)(struct net_device* dev);
|
|
|
- void (*SetWirelessMode)(struct net_device* dev, u8 wireless_mode);
|
|
|
- bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device* dev);
|
|
|
+ bool (*GetNmodeSupportBySecCfg)(struct net_device *dev);
|
|
|
+ void (*SetWirelessMode)(struct net_device *dev, u8 wireless_mode);
|
|
|
+ bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev);
|
|
|
void (*InitialGainHandler)(struct net_device *dev, u8 Operation);
|
|
|
|
|
|
/* This must be the last item so that it points to the data
|
|
@@ -2401,10 +2401,10 @@ extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
|
|
|
#if WIRELESS_EXT >= 18
|
|
|
extern int ieee80211_wx_get_encode_ext(struct ieee80211_device *ieee,
|
|
|
struct iw_request_info *info,
|
|
|
- union iwreq_data* wrqu, char *extra);
|
|
|
+ union iwreq_data *wrqu, char *extra);
|
|
|
extern int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|
|
struct iw_request_info *info,
|
|
|
- union iwreq_data* wrqu, char *extra);
|
|
|
+ union iwreq_data *wrqu, char *extra);
|
|
|
extern int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
|
|
|
struct iw_request_info *info,
|
|
|
struct iw_param *data, char *extra);
|
|
@@ -2422,7 +2422,7 @@ extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_b
|
|
|
u16 stype);
|
|
|
extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);
|
|
|
|
|
|
-void SendDisassociation(struct ieee80211_device *ieee, u8* asSta, u8 asRsn);
|
|
|
+void SendDisassociation(struct ieee80211_device *ieee, u8 *asSta, u8 asRsn);
|
|
|
extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
|
|
|
|
|
|
extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);
|
|
@@ -2528,52 +2528,52 @@ extern int ieee80211_wx_get_rts(struct ieee80211_device *ieee,
|
|
|
union iwreq_data *wrqu, char *extra);
|
|
|
//HT
|
|
|
#define MAX_RECEIVE_BUFFER_SIZE 9100 //
|
|
|
-extern void HTDebugHTCapability(u8* CapIE, u8* TitleString );
|
|
|
-extern void HTDebugHTInfo(u8* InfoIE, u8* TitleString);
|
|
|
-
|
|
|
-void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
|
|
-extern void HTUpdateDefaultSetting(struct ieee80211_device* ieee);
|
|
|
-extern void HTConstructCapabilityElement(struct ieee80211_device* ieee, u8* posHTCap, u8* len, u8 isEncrypt);
|
|
|
-extern void HTConstructInfoElement(struct ieee80211_device* ieee, u8* posHTInfo, u8* len, u8 isEncrypt);
|
|
|
-extern void HTConstructRT2RTAggElement(struct ieee80211_device* ieee, u8* posRT2RTAgg, u8* len);
|
|
|
+extern void HTDebugHTCapability(u8 *CapIE, u8 *TitleString );
|
|
|
+extern void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString);
|
|
|
+
|
|
|
+void HTSetConnectBwMode(struct ieee80211_device *ieee, HT_CHANNEL_WIDTH Bandwidth, HT_EXTCHNL_OFFSET Offset);
|
|
|
+extern void HTUpdateDefaultSetting(struct ieee80211_device *ieee);
|
|
|
+extern void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u8 *len, u8 isEncrypt);
|
|
|
+extern void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo, u8 *len, u8 isEncrypt);
|
|
|
+extern void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg, u8 *len);
|
|
|
extern void HTOnAssocRsp(struct ieee80211_device *ieee);
|
|
|
-extern void HTInitializeHTInfo(struct ieee80211_device* ieee);
|
|
|
+extern void HTInitializeHTInfo(struct ieee80211_device *ieee);
|
|
|
extern void HTInitializeBssDesc(PBSS_HT pBssHT);
|
|
|
-extern void HTResetSelfAndSavePeerSetting(struct ieee80211_device* ieee, struct ieee80211_network * pNetwork);
|
|
|
-extern void HTUpdateSelfAndPeerSetting(struct ieee80211_device* ieee, struct ieee80211_network * pNetwork);
|
|
|
-extern u8 HTGetHighestMCSRate(struct ieee80211_device* ieee, u8* pMCSRateSet, u8* pMCSFilter);
|
|
|
+extern void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee, struct ieee80211_network *pNetwork);
|
|
|
+extern void HTUpdateSelfAndPeerSetting(struct ieee80211_device *ieee, struct ieee80211_network *pNetwork);
|
|
|
+extern u8 HTGetHighestMCSRate(struct ieee80211_device *ieee, u8 *pMCSRateSet, u8 *pMCSFilter);
|
|
|
extern u8 MCS_FILTER_ALL[];
|
|
|
extern u16 MCS_DATA_RATE[2][2][77] ;
|
|
|
-extern u8 HTCCheck(struct ieee80211_device* ieee, u8* pFrame);
|
|
|
+extern u8 HTCCheck(struct ieee80211_device *ieee, u8 *pFrame);
|
|
|
//extern void HTSetConnectBwModeCallback(unsigned long data);
|
|
|
extern void HTResetIOTSetting(PRT_HIGH_THROUGHPUT pHTInfo);
|
|
|
-extern bool IsHTHalfNmodeAPs(struct ieee80211_device* ieee);
|
|
|
-extern u16 HTHalfMcsToDataRate(struct ieee80211_device* ieee, u8 nMcsRate);
|
|
|
-extern u16 HTMcsToDataRate( struct ieee80211_device* ieee, u8 nMcsRate);
|
|
|
-extern u16 TxCountToDataRate( struct ieee80211_device* ieee, u8 nDataRate);
|
|
|
+extern bool IsHTHalfNmodeAPs(struct ieee80211_device *ieee);
|
|
|
+extern u16 HTHalfMcsToDataRate(struct ieee80211_device *ieee, u8 nMcsRate);
|
|
|
+extern u16 HTMcsToDataRate( struct ieee80211_device *ieee, u8 nMcsRate);
|
|
|
+extern u16 TxCountToDataRate( struct ieee80211_device *ieee, u8 nDataRate);
|
|
|
//function in BAPROC.c
|
|
|
-extern int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb);
|
|
|
-extern int ieee80211_rx_ADDBARsp( struct ieee80211_device* ieee, struct sk_buff *skb);
|
|
|
-extern int ieee80211_rx_DELBA(struct ieee80211_device* ieee,struct sk_buff *skb);
|
|
|
-extern void TsInitAddBA( struct ieee80211_device* ieee, PTX_TS_RECORD pTS, u8 Policy, u8 bOverwritePending);
|
|
|
-extern void TsInitDelBA( struct ieee80211_device* ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
|
|
|
+extern int ieee80211_rx_ADDBAReq( struct ieee80211_device *ieee, struct sk_buff *skb);
|
|
|
+extern int ieee80211_rx_ADDBARsp( struct ieee80211_device *ieee, struct sk_buff *skb);
|
|
|
+extern int ieee80211_rx_DELBA(struct ieee80211_device *ieee,struct sk_buff *skb);
|
|
|
+extern void TsInitAddBA( struct ieee80211_device *ieee, PTX_TS_RECORD pTS, u8 Policy, u8 bOverwritePending);
|
|
|
+extern void TsInitDelBA( struct ieee80211_device *ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
|
|
|
extern void BaSetupTimeOut(unsigned long data);
|
|
|
extern void TxBaInactTimeout(unsigned long data);
|
|
|
extern void RxBaInactTimeout(unsigned long data);
|
|
|
extern void ResetBaEntry( PBA_RECORD pBA);
|
|
|
//function in TS.c
|
|
|
extern bool GetTs(
|
|
|
- struct ieee80211_device* ieee,
|
|
|
+ struct ieee80211_device *ieee,
|
|
|
PTS_COMMON_INFO *ppTS,
|
|
|
- u8* Addr,
|
|
|
+ u8 *Addr,
|
|
|
u8 TID,
|
|
|
TR_SELECT TxRxSelect, //Rx:1, Tx:0
|
|
|
bool bAddNewTs
|
|
|
);
|
|
|
extern void TSInitialize(struct ieee80211_device *ieee);
|
|
|
-extern void TsStartAddBaProcess(struct ieee80211_device* ieee, PTX_TS_RECORD pTxTS);
|
|
|
-extern void RemovePeerTS(struct ieee80211_device* ieee, u8* Addr);
|
|
|
-extern void RemoveAllTS(struct ieee80211_device* ieee);
|
|
|
+extern void TsStartAddBaProcess(struct ieee80211_device *ieee, PTX_TS_RECORD pTxTS);
|
|
|
+extern void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr);
|
|
|
+extern void RemoveAllTS(struct ieee80211_device *ieee);
|
|
|
void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
|
|
|
|
|
|
extern const long ieee80211_wlan_frequencies[];
|
|
@@ -2623,6 +2623,6 @@ extern int ieee80211_parse_info_param(struct ieee80211_device *ieee,
|
|
|
struct ieee80211_network *network,
|
|
|
struct ieee80211_rx_stats *stats);
|
|
|
|
|
|
-void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_rxb** prxbIndicateArray,u8 index);
|
|
|
+void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_rxb **prxbIndicateArray,u8 index);
|
|
|
#define RT_ASOC_RETRY_LIMIT 5
|
|
|
#endif /* IEEE80211_H */
|