diff options
| author | John W. Linville | 2010-04-23 20:43:45 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-04-23 20:43:45 +0200 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /drivers/net/wireless/iwmc3200wifi/rx.c | |
| parent | bnx2x: add support for receive hashing (diff) | |
| parent | radiotap parser: fix endian annotation (diff) | |
| download | kernel-qcow2-linux-3b51cc996e81d8a113416d8094fa4a88f8360a51.tar.gz kernel-qcow2-linux-3b51cc996e81d8a113416d8094fa4a88f8360a51.tar.xz kernel-qcow2-linux-3b51cc996e81d8a113416d8094fa4a88f8360a51.zip | |
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, return PTR_ERR(ticket_node); IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n", - ticket->action == IWM_RX_TICKET_RELEASE ? + __le16_to_cpu(ticket->action) == + IWM_RX_TICKET_RELEASE ? "RELEASE" : "DROP", ticket->id); spin_lock(&iwm->ticket_lock); |