Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 267783
b: refs/heads/master
c: 3b83db4
h: refs/heads/master
i:
  267781: 8e4084a
  267779: 2f823b7
  267775: 715bb8c
v: v3
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent f175fc5 commit bfbaa86
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43267fef107b44b3b3e73a02cfc6027b8e6336fb
refs/heads/master: 3b83db43ccbb26863f38caccc1e7fae370f31e57
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/r8192E_cmdpkt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb;
unsigned char *seg_ptr;
cb_desc *tcb_desc;
struct cb_desc *tcb_desc;
u8 bLastIniPkt;

struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
Expand All @@ -75,7 +75,7 @@
}

memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_NORMAL;
tcb_desc->bLastIniPkt = bLastIniPkt;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8192e/r8192E_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@ u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
}


void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_desc * cb_desc, struct sk_buff* skb)
void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc, struct sk_buff* skb)
{
struct r8192_priv *priv = rtllib_priv(dev);
dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
Expand Down Expand Up @@ -1257,7 +1257,7 @@ void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_de
}

void rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,
cb_desc * cb_desc, struct sk_buff* skb)
struct cb_desc *cb_desc, struct sk_buff* skb)
{
struct r8192_priv *priv = rtllib_priv(dev);
dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
Expand Down Expand Up @@ -2265,7 +2265,7 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev)
return Reval;
}

u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)
u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
{
u8 tmp_Short;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8192e/r8192E_dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "r8190P_def.h"

u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc);
u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc);
bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev);
bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev);
bool rtl8192_HalTxCheckStuck(struct net_device *dev);
Expand All @@ -45,10 +45,10 @@ void rtl8192_get_eeprom_size(struct net_device* dev);
bool rtl8192_adapter_start(struct net_device *dev);
void rtl8192_link_change(struct net_device *dev);
void rtl8192_AllowAllDestAddr(struct net_device* dev, bool bAllowAllDA, bool WriteIntoReg);
void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, cb_desc * cb_desc,
void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc,
struct sk_buff* skb);
void rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,
cb_desc * cb_desc, struct sk_buff* skb);
struct cb_desc *cb_desc, struct sk_buff* skb);
bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats *stats,
struct rx_desc *pdesc, struct sk_buff* skb);
void rtl8192_halt_adapter(struct net_device *dev, bool reset);
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rtl8192e/r8192E_firmware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff
struct rt_firmware *pfirmware = priv->pFirmware;
struct sk_buff *skb;
unsigned char *seg_ptr;
cb_desc *tcb_desc;
struct cb_desc *tcb_desc;
u8 bLastIniPkt;

firmware_init_param(dev);
Expand All @@ -60,7 +60,7 @@ bool fw_download_code(struct net_device *dev, u8 *code_virtual_address, u32 buff

skb = dev_alloc_skb(frag_length + 4);
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
tcb_desc->bLastIniPkt = bLastIniPkt;
Expand Down Expand Up @@ -103,14 +103,14 @@ fwSendNullPacket(
bool rtStatus = true;
struct r8192_priv *priv = rtllib_priv(dev);
struct sk_buff *skb;
cb_desc *tcb_desc;
struct cb_desc *tcb_desc;
unsigned char *ptr_buf;
bool bLastInitPacket = false;


skb = dev_alloc_skb(Length+ 4);
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->queue_index = TXCMD_QUEUE;
tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_INIT;
tcb_desc->bLastIniPkt = bLastInitPacket;
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/staging/rtl8192e/rtl_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ void rtl8192_prepare_beacon(struct r8192_priv *priv)
{
struct net_device *dev = priv->rtllib->dev;
struct sk_buff *pskb = NULL, *pnewskb = NULL;
cb_desc *tcb_desc = NULL;
struct cb_desc *tcb_desc = NULL;
struct rtl8192_tx_ring *ring = NULL;
struct tx_desc *pdesc = NULL;

Expand All @@ -811,7 +811,7 @@ void rtl8192_prepare_beacon(struct r8192_priv *priv)
if (!pnewskb)
return;

tcb_desc = (cb_desc *)(pnewskb->cb + 8);
tcb_desc = (struct cb_desc *)(pnewskb->cb + 8);
tcb_desc->queue_index = BEACON_QUEUE;
tcb_desc->data_rate = 2;
tcb_desc->RATRIndex = 7;
Expand Down Expand Up @@ -1425,7 +1425,7 @@ rtl819x_TxCheckStuck(struct net_device *dev)
bool bCheckFwTxCnt = false;
struct rtl8192_tx_ring *ring = NULL;
struct sk_buff* skb = NULL;
cb_desc * tcb_desc = NULL;
struct cb_desc * tcb_desc = NULL;
unsigned long flags = 0;

switch (priv->rtllib->ps)
Expand Down Expand Up @@ -1456,7 +1456,7 @@ rtl819x_TxCheckStuck(struct net_device *dev)
else
{
skb = (&ring->queue)->next;
tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc->nStuckCount++;
bCheckFwTxCnt = true;
if (tcb_desc->nStuckCount > 1)
Expand Down Expand Up @@ -1911,7 +1911,7 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
int ret;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index;

if ((priv->rtllib->eRFPowerState == eRfOff) || IS_NIC_DOWN(priv) || priv->bResetInProgress){
Expand Down Expand Up @@ -1942,7 +1942,7 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
int ret;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index;

if (queue_index != TXCMD_QUEUE){
Expand Down Expand Up @@ -2009,7 +2009,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
struct rtl8192_tx_ring *ring;
struct tx_desc_cmd * entry;
unsigned int idx;
cb_desc *tcb_desc;
struct cb_desc *tcb_desc;
unsigned long flags;

spin_lock_irqsave(&priv->irq_th_lock,flags);
Expand All @@ -2018,7 +2018,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries;
entry = (struct tx_desc_cmd *) &ring->desc[idx];

tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);

priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb);

Expand All @@ -2033,7 +2033,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
struct r8192_priv *priv = rtllib_priv(dev);
struct rtl8192_tx_ring *ring;
unsigned long flags;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct tx_desc *pdesc = NULL;
struct rtllib_hdr_1addr * header = NULL;
u16 fc=0, type=0,stype=0;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtl_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ struct rtl819x_ops{
void (* init_before_adapter_start)(struct net_device* dev);
bool (* initialize_adapter)(struct net_device* dev);
void (*link_change)(struct net_device* dev);
void (* tx_fill_descriptor)(struct net_device* dev, struct tx_desc *tx_desc, cb_desc * cb_desc, struct sk_buff *skb);
void (* tx_fill_cmd_descriptor)(struct net_device* dev, struct tx_desc_cmd * entry, cb_desc * cb_desc, struct sk_buff *skb);
void (* tx_fill_descriptor)(struct net_device* dev, struct tx_desc *tx_desc, struct cb_desc *cb_desc, struct sk_buff *skb);
void (* tx_fill_cmd_descriptor)(struct net_device* dev, struct tx_desc_cmd * entry, struct cb_desc *cb_desc, struct sk_buff *skb);
bool (* rx_query_status_descriptor)(struct net_device* dev, struct rtllib_rx_stats* stats, struct rx_desc *pdesc, struct sk_buff* skb);
bool (* rx_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, struct rx_desc *pdesc);
void (* stop_adapter)(struct net_device *dev, bool reset);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static inline void *netdev_priv_rsl(struct net_device *dev)

/* defined for skb cb field */
/* At most 28 byte */
typedef struct cb_desc {
struct cb_desc {
/* Tx Desc Related flags (8-9) */
u8 bLastIniPkt:1;
u8 bCmdOrInit:1;
Expand Down Expand Up @@ -202,7 +202,7 @@ typedef struct cb_desc {

u8 bBTTxPacket;
u8 bIsBTProbRsp;
}cb_desc, *pcb_desc;
};//, *pcb_desc;

/*--------------------------Define -------------------------------------------*/
#define MGN_1M 0x02
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
int data_len, i;
u8 *pos;
struct rtllib_hdr_4addr *hdr;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
if (skb_headroom(skb) < CCMP_HDR_LEN ||
skb_tailroom(skb) < CCMP_MIC_LEN ||
skb->len < hdr_len)
Expand Down Expand Up @@ -262,7 +262,7 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
struct rtllib_ccmp_data *key = priv;
u8 keyidx, *pos;
struct rtllib_hdr_4addr *hdr;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 pn[6];

if (skb->len < hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
int len;
u8 *pos;
struct rtllib_hdr_4addr *hdr;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct blkcipher_desc desc = {.tfm = tkey->tx_tfm_arc4};
int ret = 0;
u8 rc4key[16], *icv;
Expand Down Expand Up @@ -384,7 +384,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
u32 iv32;
u16 iv16;
struct rtllib_hdr_4addr *hdr;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct blkcipher_desc desc = {.tfm = tkey->rx_tfm_arc4};
u8 rc4key[16];
u8 icv[4];
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
u32 klen, len;
u8 key[WEP_KEY_LEN + 3];
u8 *pos;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct blkcipher_desc desc = {.tfm = wep->tx_tfm};
u32 crc;
u8 *icv;
Expand Down Expand Up @@ -170,7 +170,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
u32 klen, plen;
u8 key[WEP_KEY_LEN + 3];
u8 keyidx, *pos;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
struct blkcipher_desc desc = {.tfm = wep->rx_tfm};
u32 crc;
u8 icv[4];
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/rtllib_rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb,

if (ieee->hwsec_active)
{
cb_desc *tcb_desc = (cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
tcb_desc->bHwSec = 1;

if (ieee->need_sw_enc)
Expand Down Expand Up @@ -332,7 +332,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device* ieee, struct sk_buff *skb,
return 0;
if (ieee->hwsec_active)
{
cb_desc *tcb_desc = (cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb+ MAX_DEV_ADDR_SIZE);
tcb_desc->bHwSec = 1;

if (ieee->need_sw_enc)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rtl8192e/rtllib_softmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
struct rtllib_hdr_3addr *header=
(struct rtllib_hdr_3addr *) skb->data;

cb_desc *tcb_desc = (cb_desc *)(skb->cb + 8);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + 8);
spin_lock_irqsave(&ieee->lock, flags);

/* called with 2nd param 0, no mgmt lock required */
Expand Down Expand Up @@ -311,7 +311,7 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb,
struct rtllib_hdr_3addr *header =
(struct rtllib_hdr_3addr *) skb->data;
u16 fc,type,stype;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + 8);
struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb + 8);

fc = header->frame_ctl;
type = WLAN_FC_GET_TYPE(fc);
Expand Down Expand Up @@ -2552,7 +2552,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
unsigned int queue_index = txb->queue_index;
unsigned long flags;
int i;
cb_desc *tcb_desc = NULL;
struct cb_desc *tcb_desc = NULL;
unsigned long queue_len = 0;

spin_lock_irqsave(&ieee->lock,flags);
Expand All @@ -2561,7 +2561,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
rtllib_sta_wakeup(ieee,0);

/* update the tx status */
tcb_desc = (cb_desc *)(txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE);
tcb_desc = (struct cb_desc *)(txb->fragments[0]->cb + MAX_DEV_ADDR_SIZE);
if (tcb_desc->bMulticast) {
ieee->stats.multicast++;
}
Expand Down
Loading

0 comments on commit bfbaa86

Please sign in to comment.