summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/device.h
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-11-05 21:08:52 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-05 14:49:13 -0800
commitb1c41336570f952e0b30eaa56728996d5ac50457 (patch)
tree270b903581a41cf70db56cad48f7bba214be9f7c /drivers/staging/vt6655/device.h
parent87299d4c06f09ceb1fe866fe44c0c51d0d3f069e (diff)
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>
Diffstat (limited to 'drivers/staging/vt6655/device.h')
-rw-r--r--drivers/staging/vt6655/device.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 93d2ccb9ba67..903d782d49c9 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -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