diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-08-13 15:58:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-13 15:59:09 -0700 |
| commit | 98f1b7f3820a50a42e51f9bd3e7014cf9b2688a8 (patch) | |
| tree | 9a3797eb18583717861029f5ec7d3438135bcd06 /drivers/net/wireless/iwlwifi/iwl-io.h | |
| parent | drivers: net: cpsw: Add support for new CPSW IP version present in AM43xx SoC (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (diff) | |
| download | linux-dev-98f1b7f3820a50a42e51f9bd3e7014cf9b2688a8.tar.xz linux-dev-98f1b7f3820a50a42e51f9bd3e7014cf9b2688a8.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for 3.12. It is mostly driver
stuff, although Johannes Berg and Simon Wunderlich make a good
showing with mac80211 bits (particularly some work on 5/10 MHz
channel support).
The usual suspects are mostly represented. There are lots of updates
to iwlwifi, ath9k, ath10k, mwifiex, rt2x00, wil6210, as usual.
The bcma bus gets some love this time, as do cw1200, iwl4965, and a
few other bits here and there. I don't think there is much unusual
here, FWIW.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index fd9f5b97fff3..63d10ec08dbc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h @@ -77,4 +77,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, u32 bits, u32 mask); void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask); +/* Error handling */ +int iwl_dump_fh(struct iwl_trans *trans, char **buf); + #endif |