diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-29 22:44:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-29 22:44:25 -0500 |
| commit | 7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch) | |
| tree | e2135eddba600910cdebb54c8b01de53473ecefb /drivers/net/wireless/iwmc3200wifi | |
| parent | 96c5340147584481ef0c0afbb5423f7563c1d24a (diff) | |
| parent | 55afc80b2ab100618c17af77915f75307b6bd5d1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/iwm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h index 79ffa3b98d73..842811142bef 100644 --- a/drivers/net/wireless/iwmc3200wifi/iwm.h +++ b/drivers/net/wireless/iwmc3200wifi/iwm.h | |||
| @@ -268,7 +268,7 @@ struct iwm_priv { | |||
| 268 | 268 | ||
| 269 | struct sk_buff_head rx_list; | 269 | struct sk_buff_head rx_list; |
| 270 | struct list_head rx_tickets; | 270 | struct list_head rx_tickets; |
| 271 | struct list_head rx_packets[IWM_RX_ID_HASH]; | 271 | struct list_head rx_packets[IWM_RX_ID_HASH + 1]; |
| 272 | struct workqueue_struct *rx_wq; | 272 | struct workqueue_struct *rx_wq; |
| 273 | struct work_struct rx_worker; | 273 | struct work_struct rx_worker; |
| 274 | 274 | ||