Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324984
b: refs/heads/master
c: bf76ebd
h: refs/heads/master
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Sep 8, 2012
1 parent 1c59f6e commit 1f70924
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ac9e0fd2a7fcd4eccbb79909b421b4284ed9520
refs/heads/master: bf76ebd9cfd0018be820657da781201e2f74cf5d
48 changes: 23 additions & 25 deletions trunk/drivers/staging/vt6655/device_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,31 +398,29 @@ device_set_bool_opt(unsigned int *opt, int val,bool def,u32 flag, char* name,cha
}
}
*/
static void
device_get_options(PSDevice pDevice, int index, char* devname) {

POPTIONS pOpts = &(pDevice->sOpts);
pOpts->nRxDescs0=RX_DESC_DEF0;
pOpts->nRxDescs1=RX_DESC_DEF1;
pOpts->nTxDescs[0]=TX_DESC_DEF0;
pOpts->nTxDescs[1]=TX_DESC_DEF1;
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;

pOpts->flags|=DEVICE_FLAGS_PREAMBLE_TYPE;
pOpts->flags|=DEVICE_FLAGS_OP_MODE;
//pOpts->flags|=DEVICE_FLAGS_PS_MODE;
pOpts->short_retry=SHORT_RETRY_DEF;
pOpts->long_retry=LONG_RETRY_DEF;
pOpts->bbp_type=BBP_TYPE_DEF;
pOpts->flags|=DEVICE_FLAGS_80211h_MODE;
pOpts->flags|=DEVICE_FLAGS_DiversityANT;


static void device_get_options(PSDevice pDevice, int index, char* devname)
{
POPTIONS pOpts = &(pDevice->sOpts);

pOpts->nRxDescs0 = RX_DESC_DEF0;
pOpts->nRxDescs1 = RX_DESC_DEF1;
pOpts->nTxDescs[0] = TX_DESC_DEF0;
pOpts->nTxDescs[1] = TX_DESC_DEF1;
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;

pOpts->flags |= DEVICE_FLAGS_PREAMBLE_TYPE;
pOpts->flags |= DEVICE_FLAGS_OP_MODE;
//pOpts->flags|=DEVICE_FLAGS_PS_MODE;
pOpts->short_retry = SHORT_RETRY_DEF;
pOpts->long_retry = LONG_RETRY_DEF;
pOpts->bbp_type = BBP_TYPE_DEF;
pOpts->flags |= DEVICE_FLAGS_80211h_MODE;
pOpts->flags |= DEVICE_FLAGS_DiversityANT;
}

static void
Expand Down

0 comments on commit 1f70924

Please sign in to comment.