diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-27 17:10:13 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-27 17:10:13 +1100 |
commit | 8b3c89a70146fea62d97ff7899b05c41053732f8 (patch) | |
tree | 524efd8dcba22d9446a9978871123cfe1893b098 /drivers/staging/otus/hal/hpusb.c | |
parent | 43d8d2bb0f0983f2d861fff7b02a5c15f6838730 (diff) | |
parent | 02d418fd9a7c27e01b324383a583f5b4b7f00b7e (diff) |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/otus/hal/hpusb.c')
-rw-r--r-- | drivers/staging/otus/hal/hpusb.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/staging/otus/hal/hpusb.c b/drivers/staging/otus/hal/hpusb.c index 4b76de93fff0..ee939005be7d 100644 --- a/drivers/staging/otus/hal/hpusb.c +++ b/drivers/staging/otus/hal/hpusb.c @@ -64,9 +64,10 @@ void zfAdjustCtrlSetting(zdev_t* dev, u16_t* header, zbuf_t* buf) u32_t oldPhyCtrl; u16_t tpc = 0; + struct zsHpPriv* hpPriv; zmw_get_wlan_dev(dev); - struct zsHpPriv* hpPriv=wd->hpPrivate; + hpPriv=wd->hpPrivate; /* mm */ if (header == NULL) @@ -330,8 +331,10 @@ u16_t zfHpSend(zdev_t* dev, u16_t* header, u16_t headerLen, u16_t i; u16_t swlpOffset; #endif /* #if ZM_SW_LOOP_BACK == 1 */ + struct zsHpPriv* hpPriv; + zmw_get_wlan_dev(dev); - struct zsHpPriv* hpPriv=wd->hpPrivate; + hpPriv=wd->hpPrivate; zm_msg1_tx(ZM_LV_1, "zfHpSend(), len = ", 12 + headerLen-8 + snapLen + zfwBufGetSize(dev, buf) + 4 + 8); @@ -576,8 +579,10 @@ void zfiUsbRecv(zdev_t *dev, zbuf_t *buf) u32_t rxMCS; u32_t rxBW; u32_t rxSG; + struct zsHpPriv* hpPriv; + zmw_get_wlan_dev(dev); - struct zsHpPriv* hpPriv=wd->hpPrivate; + hpPriv=wd->hpPrivate; //zm_msg0_rx(ZM_LV_0, "zfiUsbRecv()"); |