diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-05 21:41:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-05 21:41:53 -0700 |
| commit | f3032be921cd126615ce3bfd7084e3d319f3f892 (patch) | |
| tree | c2ce874f2ab7f107dddf7b854772e0f3b64d35a1 /drivers/net/wireless/iwlwifi/iwl-sta.h | |
| parent | 70c03b49b80ba3634958acc31853771019c0ebd3 (diff) | |
| parent | 18d7260527ce7c0d0a177afdf92d8f868f50b067 (diff) | |
| download | linux-rt-f3032be921cd126615ce3bfd7084e3d319f3f892.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h index b6bb209fdd58..221b93e670a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.h +++ b/drivers/net/wireless/iwlwifi/iwl-sta.h @@ -48,7 +48,7 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, int iwl_remove_dynamic_key(struct iwl_priv *priv, struct ieee80211_key_conf *key, u8 sta_id); int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap); -u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap); +int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap); int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr); void iwl_sta_modify_enable_tid_tx(struct iwl_priv *priv, int sta_id, int tid); int iwl_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr); |