diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
| commit | ae3568adf42d5d3bb3cfa505b94351c5d1ce4924 (patch) | |
| tree | 112865a6e6b1e4ddf70362f3efb295c495ec85b9 /drivers/net/wireless/libertas/dev.h | |
| parent | 7f3e01fee41a322747db2d7574516d9fbd3785c0 (diff) | |
| parent | b7753c8cd51dce67a0b152efb456a21ff1cc241b (diff) | |
| download | kernel_samsung_smdk4412-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.tar.gz kernel_samsung_smdk4412-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.tar.bz2 kernel_samsung_smdk4412-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/dev.h')
| -rw-r--r-- | drivers/net/wireless/libertas/dev.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 4536d9c0ad8..3c7e255e18c 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h @@ -60,14 +60,10 @@ struct lbs_private { struct dentry *regs_dir; struct dentry *debugfs_regs_files[6]; - /** 11D and domain regulatory data */ - struct lbs_802_11d_domain_reg domain_reg; - /* Hardware debugging */ u32 mac_offset; u32 bbp_offset; u32 rf_offset; - struct lbs_offset_value offsetvalue; /* Power management */ u16 psmode; @@ -115,12 +111,10 @@ struct lbs_private { struct cmd_ctrl_node *cur_cmd; struct list_head cmdfreeq; /* free command buffers */ struct list_head cmdpendingq; /* pending command buffers */ - wait_queue_head_t cmd_pending; struct timer_list command_timer; int cmd_timed_out; /* Command responses sent from the hardware to the driver */ - int cur_cmd_retcode; u8 resp_idx; u8 resp_buf[2][LBS_UPLD_SIZE]; u32 resp_len[2]; |