lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI

Browse Source 
This patch removes all the errors and most of the warnings generated by
checkpatch -f for rtllib_softmac_tx.c..

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2011-08-09 20:15:22 -05:00
parent 755f3a84cf
commit 94fa3e89b4
1 changed files with 262 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
drivers/staging/rtl8192e/rtllib_tx.c
View File

@@ -49,7 +49,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include "rtllib.h" #include "rtllib.h"
@@ -177,9 +177,7 @@ inline int rtllib_put_snap(u8 *data, u16 h_proto)
return SNAP_SIZE + sizeof(u16); return SNAP_SIZE + sizeof(u16);
} }
int rtllib_encrypt_fragment( int rtllib_encrypt_fragment(struct rtllib_device *ieee, struct sk_buff *frag,
struct rtllib_device *ieee,
struct sk_buff *frag,
int hdr_len) int hdr_len)
{ {
struct rtllib_crypt_data *crypt = NULL; struct rtllib_crypt_data *crypt = NULL;
@@ -187,9 +185,8 @@ int rtllib_encrypt_fragment(
crypt = ieee->crypt[ieee->tx_keyidx]; crypt = ieee->crypt[ieee->tx_keyidx];
if (!(crypt && crypt->ops)) if (!(crypt && crypt->ops)) {
{ printk(KERN_INFO "=========>%s(), crypt is null\n", __func__);
printk("=========>%s(), crypt is null\n", __func__);
return -1; return -1;
} }
/* To encrypt, frame format is: /* To encrypt, frame format is:
@@ -216,7 +213,8 @@ int rtllib_encrypt_fragment(
} }
void rtllib_txb_free(struct rtllib_txb *txb) { void rtllib_txb_free(struct rtllib_txb *txb)
{
if (unlikely(!txb)) if (unlikely(!txb))
return; return;
kfree(txb); kfree(txb);
@@ -227,8 +225,7 @@ struct rtllib_txb *rtllib_alloc_txb(int nr_frags, int txb_size,
{ {
struct rtllib_txb *txb; struct rtllib_txb *txb;
int i; int i;
txb = kmalloc( txb = kmalloc(sizeof(struct rtllib_txb) + (sizeof(u8 *) * nr_frags),
sizeof(struct rtllib_txb) + (sizeof(u8*) * nr_frags),
gfp_mask); gfp_mask);
if (!txb) if (!txb)
return NULL; return NULL;
@@ -286,7 +283,8 @@ rtllib_classify(struct sk_buff *skb, u8 bIsAmsdu)
} }
} }
void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, struct cb_desc * tcb_desc) void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, struct sk_buff *skb,
struct cb_desc *tcb_desc)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
struct tx_ts_record *pTxTs = NULL; struct tx_ts_record *pTxTs = NULL;
@@ -299,7 +297,8 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, st
return; return;
if (!IsQoSDataFrame(skb->data)) if (!IsQoSDataFrame(skb->data))
return; return;
if (is_multicast_ether_addr(hdr->addr1) || is_broadcast_ether_addr(hdr->addr1)) if (is_multicast_ether_addr(hdr->addr1) ||
is_broadcast_ether_addr(hdr->addr1))
return; return;
if (tcb_desc->bdhcp || ieee->CntAfterLink < 2) if (tcb_desc->bdhcp || ieee->CntAfterLink < 2)
@@ -311,12 +310,14 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, st
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
return; return;
if (pHTInfo->bCurrentAMPDUEnable) { if (pHTInfo->bCurrentAMPDUEnable) {
if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true)){ if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1,
printk("%s: can't get TS\n", __func__); skb->priority, TX_DIR, true)) {
printk(KERN_INFO "%s: can't get TS\n", __func__);
return; return;
} }
if (pTxTs->TxAdmittedBARecord.bValid == false) { if (pTxTs->TxAdmittedBARecord.bValid == false) {
if (ieee->wpa_ie_len && (ieee->pairwise_key_type == KEY_TYPE_NA)) { if (ieee->wpa_ie_len && (ieee->pairwise_key_type ==
KEY_TYPE_NA)) {
; ;
} else if (tcb_desc->bdhcp == 1) { } else if (tcb_desc->bdhcp == 1) {
; ;
@@ -325,7 +326,8 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, st
} }
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
} else if (pTxTs->bUsingBa == false) { } else if (pTxTs->bUsingBa == false) {
if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum, (pTxTs->TxCurSeq+1)%4096)) if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.SeqNum,
(pTxTs->TxCurSeq+1)%4096))
pTxTs->bUsingBa = true; pTxTs->bUsingBa = true;
else else
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
@@ -352,27 +354,24 @@ FORCED_AGG_SETTING:
tcb_desc->ampdu_density = 0; tcb_desc->ampdu_density = 0;
tcb_desc->ampdu_factor = 0; tcb_desc->ampdu_factor = 0;
break; break;
} }
return; return;
} }
extern void rtllib_qurey_ShortPreambleMode(struct rtllib_device* ieee, struct cb_desc * tcb_desc) extern void rtllib_qurey_ShortPreambleMode(struct rtllib_device *ieee,
struct cb_desc *tcb_desc)
{ {
tcb_desc->bUseShortPreamble = false; tcb_desc->bUseShortPreamble = false;
if (tcb_desc->data_rate == 2) if (tcb_desc->data_rate == 2)
{
return; return;
} else if (ieee->current_network.capability &
else if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE) WLAN_CAPABILITY_SHORT_PREAMBLE)
{
tcb_desc->bUseShortPreamble = true; tcb_desc->bUseShortPreamble = true;
}
return; return;
} }
extern void extern void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
rtllib_query_HTCapShortGI(struct rtllib_device *ieee, struct cb_desc *tcb_desc) struct cb_desc *tcb_desc)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
@@ -381,8 +380,7 @@ rtllib_query_HTCapShortGI(struct rtllib_device *ieee, struct cb_desc *tcb_desc)
if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)
return; return;
if (pHTInfo->bForcedShortGI) if (pHTInfo->bForcedShortGI) {
{
tcb_desc->bUseShortGI = true; tcb_desc->bUseShortGI = true;
return; return;
} }
@@ -393,7 +391,8 @@ rtllib_query_HTCapShortGI(struct rtllib_device *ieee, struct cb_desc *tcb_desc)
tcb_desc->bUseShortGI = true; tcb_desc->bUseShortGI = true;
} }
void rtllib_query_BandwidthMode(struct rtllib_device* ieee, struct cb_desc *tcb_desc) void rtllib_query_BandwidthMode(struct rtllib_device *ieee,
struct cb_desc *tcb_desc)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
@@ -407,12 +406,14 @@ void rtllib_query_BandwidthMode(struct rtllib_device* ieee, struct cb_desc *tcb_
if ((tcb_desc->data_rate & 0x80) == 0) if ((tcb_desc->data_rate & 0x80) == 0)
return; return;
if (pHTInfo->bCurBW40MHz && pHTInfo->bCurTxBW40MHz && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) if (pHTInfo->bCurBW40MHz && pHTInfo->bCurTxBW40MHz &&
!ieee->bandwidth_auto_switch.bforced_tx20Mhz)
tcb_desc->bPacketBW = true; tcb_desc->bPacketBW = true;
return; return;
} }
void rtllib_query_protectionmode(struct rtllib_device* ieee, struct cb_desc * tcb_desc, struct sk_buff* skb) void rtllib_query_protectionmode(struct rtllib_device *ieee,
struct cb_desc *tcb_desc, struct sk_buff *skb)
{ {
tcb_desc->bRTSSTBC = false; tcb_desc->bRTSSTBC = false;
tcb_desc->bRTSUseShortGI = false; tcb_desc->bRTSUseShortGI = false;
@@ -426,65 +427,52 @@ void rtllib_query_protectionmode(struct rtllib_device* ieee, struct cb_desc * tc
if (is_broadcast_ether_addr(skb->data+16)) if (is_broadcast_ether_addr(skb->data+16))
return; return;
if (ieee->mode < IEEE_N_24G) if (ieee->mode < IEEE_N_24G) {
{ if (skb->len > ieee->rts) {
if (skb->len > ieee->rts)
{
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
} } else if (ieee->current_network.buseprotection) {
else if (ieee->current_network.buseprotection)
{
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
tcb_desc->bCTSEnable = true; tcb_desc->bCTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
} }
return; return;
} } else {
else
{
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
while (true) while (true) {
{ if (pHTInfo->IOTAction & HT_IOT_ACT_FORCED_CTS2SELF) {
if (pHTInfo->IOTAction & HT_IOT_ACT_FORCED_CTS2SELF)
{
tcb_desc->bCTSEnable = true; tcb_desc->bCTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
break; break;
} } else if (pHTInfo->IOTAction & (HT_IOT_ACT_FORCED_RTS |
else if (pHTInfo->IOTAction & (HT_IOT_ACT_FORCED_RTS|HT_IOT_ACT_PURE_N_MODE)) HT_IOT_ACT_PURE_N_MODE)) {
{
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
break; break;
} }
if (ieee->current_network.buseprotection) if (ieee->current_network.buseprotection) {
{
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
tcb_desc->bCTSEnable = true; tcb_desc->bCTSEnable = true;
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
break; break;
} }
if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) {
{
u8 HTOpMode = pHTInfo->CurrentOpMode; u8 HTOpMode = pHTInfo->CurrentOpMode;
if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 || HTOpMode == 3)) || if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 ||
(!pHTInfo->bCurBW40MHz && HTOpMode == 3) ) HTOpMode == 3)) ||
{ (!pHTInfo->bCurBW40MHz && HTOpMode == 3)) {
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
break; break;
} }
} }
if (skb->len > ieee->rts) if (skb->len > ieee->rts) {
{
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true; tcb_desc->bRTSEnable = true;
break; break;
} }
if (tcb_desc->bAMPDUEnable) if (tcb_desc->bAMPDUEnable) {
{
tcb_desc->rts_rate = MGN_24M; tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = false; tcb_desc->bRTSEnable = false;
break; break;
@@ -492,12 +480,6 @@ void rtllib_query_protectionmode(struct rtllib_device* ieee, struct cb_desc * tc
goto NO_PROTECTION; goto NO_PROTECTION;
} }
} }
if ( 0 )
{
tcb_desc->bCTSEnable = true;
tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true;
}
if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE) if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
tcb_desc->bUseShortPreamble = true; tcb_desc->bUseShortPreamble = true;
if (ieee->iw_mode == IW_MODE_MASTER) if (ieee->iw_mode == IW_MODE_MASTER)
@@ -512,33 +494,34 @@ NO_PROTECTION:
} }
void rtllib_txrate_selectmode(struct rtllib_device* ieee, struct cb_desc * tcb_desc) void rtllib_txrate_selectmode(struct rtllib_device *ieee,
struct cb_desc *tcb_desc)
{ {
if (ieee->bTxDisableRateFallBack) if (ieee->bTxDisableRateFallBack)
tcb_desc->bTxDisableRateFallBack = true; tcb_desc->bTxDisableRateFallBack = true;
if (ieee->bTxUseDriverAssingedRate) if (ieee->bTxUseDriverAssingedRate)
tcb_desc->bTxUseDriverAssingedRate = true; tcb_desc->bTxUseDriverAssingedRate = true;
if (!tcb_desc->bTxDisableRateFallBack || !tcb_desc->bTxUseDriverAssingedRate) if (!tcb_desc->bTxDisableRateFallBack ||
{ !tcb_desc->bTxUseDriverAssingedRate) {
if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) if (ieee->iw_mode == IW_MODE_INFRA ||
ieee->iw_mode == IW_MODE_ADHOC)
tcb_desc->RATRIndex = 0; tcb_desc->RATRIndex = 0;
} }
} }
u16 rtllib_query_seqnum(struct rtllib_device*ieee, struct sk_buff* skb, u8* dst) u16 rtllib_query_seqnum(struct rtllib_device *ieee, struct sk_buff *skb,
u8 *dst)
{ {
u16 seqnum = 0; u16 seqnum = 0;
if (is_multicast_ether_addr(dst) || is_broadcast_ether_addr(dst)) if (is_multicast_ether_addr(dst) || is_broadcast_ether_addr(dst))
return 0; return 0;
if (IsQoSDataFrame(skb->data)) if (IsQoSDataFrame(skb->data)) {
{
struct tx_ts_record *pTS = NULL; struct tx_ts_record *pTS = NULL;
if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, skb->priority, TX_DIR, true)) if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst,
{ skb->priority, TX_DIR, true))
return 0; return 0;
}
seqnum = pTS->TxCurSeq; seqnum = pTS->TxCurSeq;
pTS->TxCurSeq = (pTS->TxCurSeq+1)%4096; pTS->TxCurSeq = (pTS->TxCurSeq+1)%4096;
return seqnum; return seqnum;
@@ -568,7 +551,8 @@ static int wme_downgrade_ac(struct sk_buff *skb)
int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
{ {
struct rtllib_device *ieee = (struct rtllib_device *)netdev_priv_rsl(dev); struct rtllib_device *ieee = (struct rtllib_device *)
netdev_priv_rsl(dev);
struct rtllib_txb *txb = NULL; struct rtllib_txb *txb = NULL;
struct rtllib_hdr_3addrqos *frag_hdr; struct rtllib_hdr_3addrqos *frag_hdr;
int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size; int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size;
@@ -588,14 +572,16 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
struct cb_desc *tcb_desc; struct cb_desc *tcb_desc;
u8 bIsMulticast = false; u8 bIsMulticast = false;
u8 IsAmsdu = false; u8 IsAmsdu = false;
bool bdhcp = false; bool bdhcp = false;
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
/* If there is no driver handler to take the TXB, dont' bother /* If there is no driver handler to take the TXB, dont' bother
* creating it... */ * creating it... */
if ((!ieee->hard_start_xmit && !(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE))|| if ((!ieee->hard_start_xmit && !(ieee->softmac_features &
((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) { IEEE_SOFTMAC_TX_QUEUE)) ||
((!ieee->softmac_data_hard_start_xmit &&
(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) {
printk(KERN_WARNING "%s: No xmit handler.\n", printk(KERN_WARNING "%s: No xmit handler.\n",
ieee->dev->name); ieee->dev->name);
goto success; goto success;
@@ -615,39 +601,46 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
memset(skb->cb, 0, sizeof(skb->cb)); memset(skb->cb, 0, sizeof(skb->cb));
ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto); ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto);
if (ieee->iw_mode == IW_MODE_MONITOR) if (ieee->iw_mode == IW_MODE_MONITOR) {
{
txb = rtllib_alloc_txb(1, skb->len, GFP_ATOMIC); txb = rtllib_alloc_txb(1, skb->len, GFP_ATOMIC);
if (unlikely(!txb)) { if (unlikely(!txb)) {
printk(KERN_WARNING "%s: Could not allocate TXB\n", printk(KERN_WARNING "%s: Could not allocate "
"TXB\n",
ieee->dev->name); ieee->dev->name);
goto failed; goto failed;
} }
txb->encrypted = 0; txb->encrypted = 0;
txb->payload_size = skb->len; txb->payload_size = skb->len;
memcpy(skb_put(txb->fragments[0],skb->len), skb->data, skb->len); memcpy(skb_put(txb->fragments[0], skb->len), skb->data,
skb->len);
goto success; goto success;
} }
if (skb->len > 282) { if (skb->len > 282) {
if (ETH_P_IP == ether_type) { if (ETH_P_IP == ether_type) {
const struct iphdr *ip = (struct iphdr *)((u8 *)skb->data+14); const struct iphdr *ip = (struct iphdr *)
((u8 *)skb->data+14);
if (IPPROTO_UDP == ip->protocol) { if (IPPROTO_UDP == ip->protocol) {
struct udphdr *udp = (struct udphdr *)((u8 *)ip + (ip->ihl << 2)); struct udphdr *udp;
if (((((u8 *)udp)[1] == 68) && (((u8 *)udp)[3] == 67)) ||
((((u8 *)udp)[1] == 67) && (((u8 *)udp)[3] == 68))) { udp = (struct udphdr *)((u8 *)ip +
(ip->ihl << 2));
if (((((u8 *)udp)[1] == 68) &&
(((u8 *)udp)[3] == 67)) ||
((((u8 *)udp)[1] == 67) &&
(((u8 *)udp)[3] == 68))) {
bdhcp = true; bdhcp = true;
ieee->LPSDelayCnt = 200; ieee->LPSDelayCnt = 200;
} }
} }
} else if (ETH_P_ARP == ether_type) { } else if (ETH_P_ARP == ether_type) {
printk("=================>DHCP Protocol start tx ARP pkt!!\n"); printk(KERN_INFO "=================>DHCP "
"Protocol start tx ARP pkt!!\n");
bdhcp = true; bdhcp = true;
ieee->LPSDelayCnt = ieee->current_network.tim.tim_count; ieee->LPSDelayCnt =
ieee->current_network.tim.tim_count;
} }
} }
@@ -662,7 +655,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
} }
if (crypt && !encrypt && ether_type == ETH_P_PAE) { if (crypt && !encrypt && ether_type == ETH_P_PAE) {
struct eapol *eap = (struct eapol *)(skb->data + struct eapol *eap = (struct eapol *)(skb->data +
sizeof(struct ethhdr) - SNAP_SIZE - sizeof(u16)); sizeof(struct ethhdr) - SNAP_SIZE -
sizeof(u16));
RTLLIB_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n", RTLLIB_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n",
eap_get_type(eap->type)); eap_get_type(eap->type));
} }
@@ -687,10 +681,12 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
fc |= RTLLIB_FCTL_TODS; fc |= RTLLIB_FCTL_TODS;
/* To DS: Addr1 = BSSID, Addr2 = SA, /* To DS: Addr1 = BSSID, Addr2 = SA,
Addr3 = DA */ Addr3 = DA */
memcpy(&header.addr1, ieee->current_network.bssid, ETH_ALEN); memcpy(&header.addr1, ieee->current_network.bssid,
ETH_ALEN);
memcpy(&header.addr2, &src, ETH_ALEN); memcpy(&header.addr2, &src, ETH_ALEN);
if (IsAmsdu) if (IsAmsdu)
memcpy(&header.addr3, ieee->current_network.bssid, ETH_ALEN); memcpy(&header.addr3,
ieee->current_network.bssid, ETH_ALEN);
else else
memcpy(&header.addr3, &dest, ETH_ALEN); memcpy(&header.addr3, &dest, ETH_ALEN);
} else if (ieee->iw_mode == IW_MODE_ADHOC) { } else if (ieee->iw_mode == IW_MODE_ADHOC) {
@@ -698,10 +694,12 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
Addr3 = BSSID */ Addr3 = BSSID */
memcpy(&header.addr1, dest, ETH_ALEN); memcpy(&header.addr1, dest, ETH_ALEN);
memcpy(&header.addr2, src, ETH_ALEN); memcpy(&header.addr2, src, ETH_ALEN);
memcpy(&header.addr3, ieee->current_network.bssid, ETH_ALEN); memcpy(&header.addr3, ieee->current_network.bssid,
ETH_ALEN);
} }
bIsMulticast = is_broadcast_ether_addr(header.addr1) ||is_multicast_ether_addr(header.addr1); bIsMulticast = is_broadcast_ether_addr(header.addr1) ||
is_multicast_ether_addr(header.addr1);
header.frame_ctl = cpu_to_le16(fc); header.frame_ctl = cpu_to_le16(fc);
@@ -720,11 +718,11 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
/* in case we are a client verify acm is not set for this ac */ /* in case we are a client verify acm is not set for this ac */
while (unlikely(ieee->wmm_acm & (0x01 << skb->priority))) { while (unlikely(ieee->wmm_acm & (0x01 << skb->priority))) {
printk("skb->priority = %x\n", skb->priority); printk(KERN_INFO "skb->priority = %x\n", skb->priority);
if (wme_downgrade_ac(skb)) { if (wme_downgrade_ac(skb))
break; break;
} printk(KERN_INFO "converted skb->priority = %x\n",
printk("converted skb->priority = %x\n", skb->priority); skb->priority);
} }
qos_ctl |= skb->priority; qos_ctl |= skb->priority;
header.qos_ctl = cpu_to_le16(qos_ctl & RTLLIB_QOS_TID); header.qos_ctl = cpu_to_le16(qos_ctl & RTLLIB_QOS_TID);
@@ -733,14 +731,15 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
} }
/* Determine amount of payload per fragment. Regardless of if /* Determine amount of payload per fragment. Regardless of if
* this stack is providing the full 802.11 header, one will * this stack is providing the full 802.11 header, one will
* eventually be affixed to this fragment -- so we must account for * eventually be affixed to this fragment -- so we must account
* it when determining the amount of payload space. */ * for it when determining the amount of payload space. */
bytes_per_frag = frag_size - hdr_len; bytes_per_frag = frag_size - hdr_len;
if (ieee->config & if (ieee->config &
(CFG_RTLLIB_COMPUTE_FCS | CFG_RTLLIB_RESERVE_FCS)) (CFG_RTLLIB_COMPUTE_FCS | CFG_RTLLIB_RESERVE_FCS))
bytes_per_frag -= RTLLIB_FCS_LEN; bytes_per_frag -= RTLLIB_FCS_LEN;
/* Each fragment may need to have room for encryptiong pre/postfix */ /* Each fragment may need to have room for encryptiong
* pre/postfix */
if (encrypt) { if (encrypt) {
bytes_per_frag -= crypt->ops->extra_prefix_len + bytes_per_frag -= crypt->ops->extra_prefix_len +
crypt->ops->extra_postfix_len; crypt->ops->extra_postfix_len;
@@ -754,10 +753,11 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
else else
bytes_last_frag = bytes_per_frag; bytes_last_frag = bytes_per_frag;
/* When we allocate the TXB we allocate enough space for the reserve /* When we allocate the TXB we allocate enough space for the
* and full fragment bytes (bytes_per_frag doesn't include prefix, * reserve and full fragment bytes (bytes_per_frag doesn't
* postfix, header, FCS, etc.) */ * include prefix, postfix, header, FCS, etc.) */
txb = rtllib_alloc_txb(nr_frags, frag_size + ieee->tx_headroom, GFP_ATOMIC); txb = rtllib_alloc_txb(nr_frags, frag_size +
ieee->tx_headroom, GFP_ATOMIC);
if (unlikely(!txb)) { if (unlikely(!txb)) {
printk(KERN_WARNING "%s: Could not allocate TXB\n", printk(KERN_WARNING "%s: Could not allocate TXB\n",
ieee->dev->name); ieee->dev->name);
@@ -767,15 +767,14 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
txb->payload_size = bytes; txb->payload_size = bytes;
if (qos_actived) if (qos_actived)
{
txb->queue_index = UP2AC(skb->priority); txb->queue_index = UP2AC(skb->priority);
} else { else
txb->queue_index = WME_AC_BE;; txb->queue_index = WME_AC_BE;
}
for (i = 0; i < nr_frags; i++) { for (i = 0; i < nr_frags; i++) {
skb_frag = txb->fragments[i]; skb_frag = txb->fragments[i];
tcb_desc = (struct cb_desc *)(skb_frag->cb + MAX_DEV_ADDR_SIZE); tcb_desc = (struct cb_desc *)(skb_frag->cb +
MAX_DEV_ADDR_SIZE);
if (qos_actived) { if (qos_actived) {
skb_frag->priority = skb->priority; skb_frag->priority = skb->priority;
tcb_desc->queue_index = UP2AC(skb->priority); tcb_desc->queue_index = UP2AC(skb->priority);
@@ -790,36 +789,41 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
tcb_desc->bHwSec = 1; tcb_desc->bHwSec = 1;
else else
tcb_desc->bHwSec = 0; tcb_desc->bHwSec = 0;
skb_reserve(skb_frag, crypt->ops->extra_prefix_len); skb_reserve(skb_frag,
crypt->ops->extra_prefix_len);
} else { } else {
tcb_desc->bHwSec = 0; tcb_desc->bHwSec = 0;
} }
frag_hdr = (struct rtllib_hdr_3addrqos *)skb_put(skb_frag, hdr_len); frag_hdr = (struct rtllib_hdr_3addrqos *)
skb_put(skb_frag, hdr_len);
memcpy(frag_hdr, &header, hdr_len); memcpy(frag_hdr, &header, hdr_len);
/* If this is not the last fragment, then add the MOREFRAGS /* If this is not the last fragment, then add the
* bit to the frame control */ * MOREFRAGS bit to the frame control */
if (i != nr_frags - 1) { if (i != nr_frags - 1) {
frag_hdr->frame_ctl = cpu_to_le16( frag_hdr->frame_ctl = cpu_to_le16(
fc | RTLLIB_FCTL_MOREFRAGS); fc | RTLLIB_FCTL_MOREFRAGS);
bytes = bytes_per_frag; bytes = bytes_per_frag;
} else { } else {
/* The last fragment takes the remaining length */ /* The last fragment has the remaining length */
bytes = bytes_last_frag; bytes = bytes_last_frag;
} }
if ((qos_actived) && (!bIsMulticast)) if ((qos_actived) && (!bIsMulticast)) {
{ frag_hdr->seq_ctl =
frag_hdr->seq_ctl = rtllib_query_seqnum(ieee, skb_frag, header.addr1); rtllib_query_seqnum(ieee, skb_frag,
frag_hdr->seq_ctl = cpu_to_le16(frag_hdr->seq_ctl<<4 | i); header.addr1);
frag_hdr->seq_ctl =
cpu_to_le16(frag_hdr->seq_ctl<<4 | i);
} else { } else {
frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0]<<4 | i); frag_hdr->seq_ctl =
cpu_to_le16(ieee->seq_ctrl[0]<<4 | i);
} }
/* Put a SNAP header on the first fragment */ /* Put a SNAP header on the first fragment */
if (i == 0) { if (i == 0) {
rtllib_put_snap( rtllib_put_snap(
skb_put(skb_frag, SNAP_SIZE + sizeof(u16)), skb_put(skb_frag, SNAP_SIZE +
ether_type); sizeof(u16)), ether_type);
bytes -= SNAP_SIZE + sizeof(u16); bytes -= SNAP_SIZE + sizeof(u16);
} }
@@ -828,10 +832,12 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
/* Advance the SKB... */ /* Advance the SKB... */
skb_pull(skb, bytes); skb_pull(skb, bytes);
/* Encryption routine will move the header forward in order /* Encryption routine will move the header forward in
* to insert the IV between the header and the payload */ * order to insert the IV between the header and the
* payload */
if (encrypt) if (encrypt)
rtllib_encrypt_fragment(ieee, skb_frag, hdr_len); rtllib_encrypt_fragment(ieee, skb_frag,
hdr_len);
if (ieee->config & if (ieee->config &
(CFG_RTLLIB_COMPUTE_FCS | CFG_RTLLIB_RESERVE_FCS)) (CFG_RTLLIB_COMPUTE_FCS | CFG_RTLLIB_RESERVE_FCS))
skb_put(skb_frag, 4); skb_put(skb_frag, 4);
@@ -864,20 +870,22 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
txb->encrypted = 0; txb->encrypted = 0;
txb->payload_size = skb->len; txb->payload_size = skb->len;
memcpy(skb_put(txb->fragments[0],skb->len), skb->data, skb->len); memcpy(skb_put(txb->fragments[0], skb->len), skb->data,
skb->len);
} }
success: success:
if (txb) if (txb) {
{ struct cb_desc *tcb_desc = (struct cb_desc *)
struct cb_desc *tcb_desc = (struct cb_desc *)(txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE); (txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->bTxEnableFwCalcDur = 1; tcb_desc->bTxEnableFwCalcDur = 1;
tcb_desc->priority = skb->priority; tcb_desc->priority = skb->priority;
if (ether_type == ETH_P_PAE) { if (ether_type == ETH_P_PAE) {
if (ieee->pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) if (ieee->pHTInfo->IOTAction &
{ HT_IOT_ACT_WA_IOT_Broadcom) {
tcb_desc->data_rate = MgntQuery_TxRateExcludeCCKRates(ieee); tcb_desc->data_rate =
MgntQuery_TxRateExcludeCCKRates(ieee);
tcb_desc->bTxDisableRateFallBack = false; tcb_desc->bTxDisableRateFallBack = false;
} else { } else {
tcb_desc->data_rate = ieee->basic_rate; tcb_desc->data_rate = ieee->basic_rate;
@@ -896,12 +904,14 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
if (tcb_desc->bMulticast || tcb_desc->bBroadcast) if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
tcb_desc->data_rate = ieee->basic_rate; tcb_desc->data_rate = ieee->basic_rate;
else else
tcb_desc->data_rate = CURRENT_RATE(ieee->mode, ieee->rate, ieee->HTCurrentOperaRate); tcb_desc->data_rate = CURRENT_RATE(ieee->mode,
ieee->rate, ieee->HTCurrentOperaRate);
if (bdhcp == true) { if (bdhcp == true) {
if (ieee->pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) if (ieee->pHTInfo->IOTAction &
{ HT_IOT_ACT_WA_IOT_Broadcom) {
tcb_desc->data_rate = MgntQuery_TxRateExcludeCCKRates(ieee); tcb_desc->data_rate =
MgntQuery_TxRateExcludeCCKRates(ieee);
tcb_desc->bTxDisableRateFallBack = false; tcb_desc->bTxDisableRateFallBack = false;
} else { } else {
tcb_desc->data_rate = MGN_1M; tcb_desc->data_rate = MGN_1M;
@@ -915,10 +925,12 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
} }
rtllib_qurey_ShortPreambleMode(ieee, tcb_desc); rtllib_qurey_ShortPreambleMode(ieee, tcb_desc);
rtllib_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc); rtllib_tx_query_agg_cap(ieee, txb->fragments[0],
tcb_desc);
rtllib_query_HTCapShortGI(ieee, tcb_desc); rtllib_query_HTCapShortGI(ieee, tcb_desc);
rtllib_query_BandwidthMode(ieee, tcb_desc); rtllib_query_BandwidthMode(ieee, tcb_desc);
rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]); rtllib_query_protectionmode(ieee, tcb_desc,
txb->fragments[0]);
} }
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);