diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /drivers/net/wireless/iwmc3200wifi/rx.c | |
| parent | c68ed255265968c3948fa2678bf59d15c471b055 (diff) | |
| parent | 672724403b42da1d276c6cf811e8e34d15efd964 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/rx.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index ad5398779240..e1184deca559 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
| @@ -431,7 +431,8 @@ static int iwm_ntf_rx_ticket(struct iwm_priv *iwm, u8 *buf, | |||
| 431 | return PTR_ERR(ticket_node); | 431 | return PTR_ERR(ticket_node); |
| 432 | 432 | ||
| 433 | IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n", | 433 | IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n", |
| 434 | ticket->action == IWM_RX_TICKET_RELEASE ? | 434 | __le16_to_cpu(ticket->action) == |
| 435 | IWM_RX_TICKET_RELEASE ? | ||
| 435 | "RELEASE" : "DROP", | 436 | "RELEASE" : "DROP", |
| 436 | ticket->id); | 437 | ticket->id); |
| 437 | spin_lock(&iwm->ticket_lock); | 438 | spin_lock(&iwm->ticket_lock); |