mirror of https://gitee.com/openkylin/linux.git
staging: vt6655: remove fragmentation from driver
fragmentation is now handled by mac80211. Remove functions device_alloc_frag_buf device_init_defrag_cb device_free_frag_buf Removing typedef struct tagSDeFragControlBlock frag_thresh sRxDFCB cbDFCB; cbFreeDFCB; uCurrentDFCBIdx; macros FRAG_THRESH_MIN FRAG_THRESH_MAX Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley
Greg Kroah-Hartman
parent
87299d4c06
commit
b1c4133657
|
|
@ -583,9 +583,6 @@ CARDvSafeResetRx(
|
|||
pDesc->m_rd1RD1.wReqCount = (unsigned short)(pDevice->rx_buf_sz);
|
||||
}
|
||||
|
||||
pDevice->cbDFCB = CB_MAX_RX_FRAG;
|
||||
pDevice->cbFreeDFCB = pDevice->cbDFCB;
|
||||
|
||||
/* set perPkt mode */
|
||||
MACvRx0PerPktMode(pDevice->PortOffset);
|
||||
MACvRx1PerPktMode(pDevice->PortOffset);
|
||||
|
|
|
|||
|
|
@ -177,19 +177,6 @@ typedef enum {
|
|||
OWNED_BY_NIC = 1
|
||||
} DEVICE_OWNER_TYPE, *PDEVICE_OWNER_TYPE;
|
||||
|
||||
#define CB_MAX_RX_FRAG 64
|
||||
/* DeFragment Control Block, used for collecting fragments prior to reassembly */
|
||||
typedef struct tagSDeFragControlBlock {
|
||||
unsigned short wSequence;
|
||||
unsigned short wFragNum;
|
||||
unsigned char abyAddr2[ETH_ALEN];
|
||||
unsigned int uLifetime;
|
||||
struct sk_buff *skb;
|
||||
unsigned char *pbyRxBuffer;
|
||||
unsigned int cbFrameLength;
|
||||
bool bInUse;
|
||||
} SDeFragControlBlock, *PSDeFragControlBlock;
|
||||
|
||||
/* flags for options */
|
||||
#define DEVICE_FLAGS_IP_ALIGN 0x00000001UL
|
||||
#define DEVICE_FLAGS_PREAMBLE_TYPE 0x00000002UL
|
||||
|
|
@ -223,7 +210,6 @@ typedef struct __device_opt {
|
|||
int nTxDescs[2]; /* Number of TX descriptors 0, 1 */
|
||||
int int_works; /* interrupt limits */
|
||||
int rts_thresh; /* rts threshold */
|
||||
int frag_thresh;
|
||||
int data_rate;
|
||||
int channel_num;
|
||||
int short_retry;
|
||||
|
|
@ -287,11 +273,6 @@ struct vnt_private {
|
|||
volatile PSRxDesc aRD1Ring;
|
||||
volatile PSRxDesc pCurrRD[TYPE_MAXRD];
|
||||
|
||||
SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG];
|
||||
unsigned int cbDFCB;
|
||||
unsigned int cbFreeDFCB;
|
||||
unsigned int uCurrentDFCBIdx;
|
||||
|
||||
OPTIONS sOpts;
|
||||
|
||||
u32 flags;
|
||||
|
|
@ -364,7 +345,6 @@ struct vnt_private {
|
|||
|
||||
unsigned short wCurrentRate;
|
||||
unsigned short wRTSThreshold;
|
||||
unsigned short wFragmentationThreshold;
|
||||
unsigned char byShortRetryLimit;
|
||||
unsigned char byLongRetryLimit;
|
||||
enum nl80211_iftype op_mode;
|
||||
|
|
@ -487,9 +467,4 @@ static inline PDEVICE_TD_INFO alloc_td_info(void)
|
|||
{
|
||||
return kzalloc(sizeof(DEVICE_TD_INFO), GFP_ATOMIC);
|
||||
}
|
||||
|
||||
/*--------------------- Export Functions --------------------------*/
|
||||
|
||||
bool device_alloc_frag_buf(struct vnt_private *pDevice,
|
||||
PSDeFragControlBlock pDeF);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -35,16 +35,13 @@
|
|||
* device_intr - interrupt handle function
|
||||
* device_rx_srv - rx service function
|
||||
* device_alloc_rx_buf - rx buffer pre-allocated function
|
||||
* device_alloc_frag_buf - rx fragement pre-allocated function
|
||||
* device_free_tx_buf - free tx buffer function
|
||||
* device_free_frag_buf- free de-fragement buffer
|
||||
* device_init_rd0_ring- initial rd dma0 ring
|
||||
* device_init_rd1_ring- initial rd dma1 ring
|
||||
* device_init_td0_ring- initial tx dma0 ring buffer
|
||||
* device_init_td1_ring- initial tx dma1 ring buffer
|
||||
* device_init_registers- initial MAC & BBP & RF internal registers.
|
||||
* device_init_rings- initial tx/rx ring buffer
|
||||
* device_init_defrag_cb- initial & allocate de-fragement buffer.
|
||||
* device_free_rings- free all allocated ring buffer
|
||||
* device_tx_srv- tx interrupt service function
|
||||
*
|
||||
|
|
@ -132,12 +129,8 @@ DEVICE_PARAM(PreambleType, "Preamble Type");
|
|||
|
||||
DEVICE_PARAM(RTSThreshold, "RTS threshold");
|
||||
|
||||
#define FRAG_THRESH_MIN 256
|
||||
#define FRAG_THRESH_MAX 2346
|
||||
#define FRAG_THRESH_DEF 2346
|
||||
|
||||
DEVICE_PARAM(FragThreshold, "Fragmentation threshold");
|
||||
|
||||
#define DATA_RATE_MIN 0
|
||||
#define DATA_RATE_MAX 13
|
||||
#define DATA_RATE_DEF 13
|
||||
|
|
@ -256,7 +249,6 @@ static struct notifier_block device_notifier = {
|
|||
|
||||
static void device_init_rd0_ring(struct vnt_private *pDevice);
|
||||
static void device_init_rd1_ring(struct vnt_private *pDevice);
|
||||
static void device_init_defrag_cb(struct vnt_private *pDevice);
|
||||
static void device_init_td0_ring(struct vnt_private *pDevice);
|
||||
static void device_init_td1_ring(struct vnt_private *pDevice);
|
||||
|
||||
|
|
@ -270,7 +262,6 @@ static void device_free_td1_ring(struct vnt_private *pDevice);
|
|||
static void device_free_rd0_ring(struct vnt_private *pDevice);
|
||||
static void device_free_rd1_ring(struct vnt_private *pDevice);
|
||||
static void device_free_rings(struct vnt_private *pDevice);
|
||||
static void device_free_frag_buf(struct vnt_private *pDevice);
|
||||
|
||||
/*--------------------- Export Variables --------------------------*/
|
||||
|
||||
|
|
@ -306,7 +297,6 @@ static void device_get_options(struct vnt_private *pDevice)
|
|||
pOpts->flags |= DEVICE_FLAGS_IP_ALIGN;
|
||||
pOpts->int_works = INT_WORKS_DEF;
|
||||
pOpts->rts_thresh = RTS_THRESH_DEF;
|
||||
pOpts->frag_thresh = FRAG_THRESH_DEF;
|
||||
pOpts->data_rate = DATA_RATE_DEF;
|
||||
pOpts->channel_num = CHANNEL_DEF;
|
||||
|
||||
|
|
@ -332,7 +322,6 @@ device_set_options(struct vnt_private *pDevice)
|
|||
|
||||
pDevice->uChannel = pDevice->sOpts.channel_num;
|
||||
pDevice->wRTSThreshold = pDevice->sOpts.rts_thresh;
|
||||
pDevice->wFragmentationThreshold = pDevice->sOpts.frag_thresh;
|
||||
pDevice->byShortRetryLimit = pDevice->sOpts.short_retry;
|
||||
pDevice->byLongRetryLimit = pDevice->sOpts.long_retry;
|
||||
pDevice->wMaxTransmitMSDULifetime = DEFAULT_MSDU_LIFETIME;
|
||||
|
|
@ -853,21 +842,6 @@ static void device_init_rd1_ring(struct vnt_private *pDevice)
|
|||
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
|
||||
}
|
||||
|
||||
static void device_init_defrag_cb(struct vnt_private *pDevice)
|
||||
{
|
||||
int i;
|
||||
PSDeFragControlBlock pDeF;
|
||||
|
||||
/* Init the fragment ctl entries */
|
||||
for (i = 0; i < CB_MAX_RX_FRAG; i++) {
|
||||
pDeF = &(pDevice->sRxDFCB[i]);
|
||||
if (!device_alloc_frag_buf(pDevice, pDeF))
|
||||
dev_err(&pDevice->pcid->dev, "can not alloc frag bufs\n");
|
||||
}
|
||||
pDevice->cbDFCB = CB_MAX_RX_FRAG;
|
||||
pDevice->cbFreeDFCB = pDevice->cbDFCB;
|
||||
}
|
||||
|
||||
static void device_free_rd0_ring(struct vnt_private *pDevice)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -902,20 +876,6 @@ static void device_free_rd1_ring(struct vnt_private *pDevice)
|
|||
}
|
||||
}
|
||||
|
||||
static void device_free_frag_buf(struct vnt_private *pDevice)
|
||||
{
|
||||
PSDeFragControlBlock pDeF;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < CB_MAX_RX_FRAG; i++) {
|
||||
pDeF = &(pDevice->sRxDFCB[i]);
|
||||
|
||||
if (pDeF->skb)
|
||||
dev_kfree_skb(pDeF->skb);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static void device_init_td0_ring(struct vnt_private *pDevice)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -1056,17 +1016,6 @@ static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool device_alloc_frag_buf(struct vnt_private *pDevice,
|
||||
PSDeFragControlBlock pDeF)
|
||||
{
|
||||
pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
|
||||
if (pDeF->skb == NULL)
|
||||
return false;
|
||||
ASSERT(pDeF->skb);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static const u8 fallback_rate0[5][5] = {
|
||||
{RATE_18M, RATE_18M, RATE_12M, RATE_12M, RATE_12M},
|
||||
{RATE_24M, RATE_24M, RATE_18M, RATE_12M, RATE_12M},
|
||||
|
|
@ -1466,7 +1415,6 @@ static int vnt_start(struct ieee80211_hw *hw)
|
|||
dev_dbg(&priv->pcid->dev, "call device init rd0 ring\n");
|
||||
device_init_rd0_ring(priv);
|
||||
device_init_rd1_ring(priv);
|
||||
device_init_defrag_cb(priv);
|
||||
device_init_td0_ring(priv);
|
||||
device_init_td1_ring(priv);
|
||||
|
||||
|
|
@ -1494,7 +1442,6 @@ static void vnt_stop(struct ieee80211_hw *hw)
|
|||
device_free_td1_ring(priv);
|
||||
device_free_rd0_ring(priv);
|
||||
device_free_rd1_ring(priv);
|
||||
device_free_frag_buf(priv);
|
||||
device_free_rings(priv);
|
||||
|
||||
free_irq(priv->pcid->irq, priv);
|
||||
|
|
|
|||
Loading…
Reference in New Issue