diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 56 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 14 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 12 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sv-open.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 5 |
12 files changed, 63 insertions, 56 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 14b4c5ac751..e88aca5282e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -239,7 +239,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, | |||
239 | { | 239 | { |
240 | /* | 240 | /* |
241 | * MULTI-FIXME | 241 | * MULTI-FIXME |
242 | * See iwl_mac_channel_switch. | 242 | * See iwlagn_mac_channel_switch. |
243 | */ | 243 | */ |
244 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 244 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
245 | struct iwl5000_channel_switch_cmd cmd; | 245 | struct iwl5000_channel_switch_cmd cmd; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 8e3cdd9f0c7..4abfcf2f257 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -187,7 +187,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, | |||
187 | { | 187 | { |
188 | /* | 188 | /* |
189 | * MULTI-FIXME | 189 | * MULTI-FIXME |
190 | * See iwl_mac_channel_switch. | 190 | * See iwlagn_mac_channel_switch. |
191 | */ | 191 | */ |
192 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 192 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
193 | struct iwl6000_channel_switch_cmd cmd; | 193 | struct iwl6000_channel_switch_cmd cmd; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index dccb230dd52..6c57199b041 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -565,7 +565,7 @@ struct iwlagn_ucode_capabilities { | |||
565 | }; | 565 | }; |
566 | 566 | ||
567 | static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context); | 567 | static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context); |
568 | static int iwl_mac_setup_register(struct iwl_priv *priv, | 568 | static int iwlagn_mac_setup_register(struct iwl_priv *priv, |
569 | struct iwlagn_ucode_capabilities *capa); | 569 | struct iwlagn_ucode_capabilities *capa); |
570 | 570 | ||
571 | #define UCODE_EXPERIMENTAL_INDEX 100 | 571 | #define UCODE_EXPERIMENTAL_INDEX 100 |
@@ -1136,7 +1136,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
1136 | * | 1136 | * |
1137 | * 9. Setup and register with mac80211 and debugfs | 1137 | * 9. Setup and register with mac80211 and debugfs |
1138 | **************************************************/ | 1138 | **************************************************/ |
1139 | err = iwl_mac_setup_register(priv, &ucode_capa); | 1139 | err = iwlagn_mac_setup_register(priv, &ucode_capa); |
1140 | if (err) | 1140 | if (err) |
1141 | goto out_unbind; | 1141 | goto out_unbind; |
1142 | 1142 | ||
@@ -1642,7 +1642,7 @@ iwlagn_iface_combinations_p2p[] = { | |||
1642 | * Not a mac80211 entry point function, but it fits in with all the | 1642 | * Not a mac80211 entry point function, but it fits in with all the |
1643 | * other mac80211 functions grouped here. | 1643 | * other mac80211 functions grouped here. |
1644 | */ | 1644 | */ |
1645 | static int iwl_mac_setup_register(struct iwl_priv *priv, | 1645 | static int iwlagn_mac_setup_register(struct iwl_priv *priv, |
1646 | struct iwlagn_ucode_capabilities *capa) | 1646 | struct iwlagn_ucode_capabilities *capa) |
1647 | { | 1647 | { |
1648 | int ret; | 1648 | int ret; |
@@ -2761,7 +2761,7 @@ static void iwlagn_disable_roc_work(struct work_struct *work) | |||
2761 | mutex_unlock(&priv->shrd->mutex); | 2761 | mutex_unlock(&priv->shrd->mutex); |
2762 | } | 2762 | } |
2763 | 2763 | ||
2764 | static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw, | 2764 | static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw, |
2765 | struct ieee80211_channel *channel, | 2765 | struct ieee80211_channel *channel, |
2766 | enum nl80211_channel_type channel_type, | 2766 | enum nl80211_channel_type channel_type, |
2767 | int duration) | 2767 | int duration) |
@@ -2825,7 +2825,7 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw, | |||
2825 | return err; | 2825 | return err; |
2826 | } | 2826 | } |
2827 | 2827 | ||
2828 | static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) | 2828 | static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) |
2829 | { | 2829 | { |
2830 | struct iwl_priv *priv = hw->priv; | 2830 | struct iwl_priv *priv = hw->priv; |
2831 | 2831 | ||
@@ -2842,8 +2842,10 @@ static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) | |||
2842 | return 0; | 2842 | return 0; |
2843 | } | 2843 | } |
2844 | 2844 | ||
2845 | static int iwl_mac_tx_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 2845 | static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw, |
2846 | const u8 *bssid, enum ieee80211_tx_sync_type type) | 2846 | struct ieee80211_vif *vif, |
2847 | const u8 *bssid, | ||
2848 | enum ieee80211_tx_sync_type type) | ||
2847 | { | 2849 | { |
2848 | struct iwl_priv *priv = hw->priv; | 2850 | struct iwl_priv *priv = hw->priv; |
2849 | struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; | 2851 | struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; |
@@ -2890,7 +2892,7 @@ static int iwl_mac_tx_sync(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
2890 | return ret; | 2892 | return ret; |
2891 | } | 2893 | } |
2892 | 2894 | ||
2893 | static void iwl_mac_finish_tx_sync(struct ieee80211_hw *hw, | 2895 | static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw, |
2894 | struct ieee80211_vif *vif, | 2896 | struct ieee80211_vif *vif, |
2895 | const u8 *bssid, | 2897 | const u8 *bssid, |
2896 | enum ieee80211_tx_sync_type type) | 2898 | enum ieee80211_tx_sync_type type) |
@@ -3067,7 +3069,7 @@ static void iwl_uninit_drv(struct iwl_priv *priv) | |||
3067 | #endif | 3069 | #endif |
3068 | } | 3070 | } |
3069 | 3071 | ||
3070 | static void iwl_mac_rssi_callback(struct ieee80211_hw *hw, | 3072 | static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw, |
3071 | enum ieee80211_rssi_event rssi_event) | 3073 | enum ieee80211_rssi_event rssi_event) |
3072 | { | 3074 | { |
3073 | struct iwl_priv *priv = hw->priv; | 3075 | struct iwl_priv *priv = hw->priv; |
@@ -3092,7 +3094,7 @@ static void iwl_mac_rssi_callback(struct ieee80211_hw *hw, | |||
3092 | IWL_DEBUG_MAC80211(priv, "leave\n"); | 3094 | IWL_DEBUG_MAC80211(priv, "leave\n"); |
3093 | } | 3095 | } |
3094 | 3096 | ||
3095 | static int iwl_mac_set_tim(struct ieee80211_hw *hw, | 3097 | static int iwlagn_mac_set_tim(struct ieee80211_hw *hw, |
3096 | struct ieee80211_sta *sta, bool set) | 3098 | struct ieee80211_sta *sta, bool set) |
3097 | { | 3099 | { |
3098 | struct iwl_priv *priv = hw->priv; | 3100 | struct iwl_priv *priv = hw->priv; |
@@ -3110,32 +3112,32 @@ struct ieee80211_ops iwlagn_hw_ops = { | |||
3110 | .suspend = iwlagn_mac_suspend, | 3112 | .suspend = iwlagn_mac_suspend, |
3111 | .resume = iwlagn_mac_resume, | 3113 | .resume = iwlagn_mac_resume, |
3112 | #endif | 3114 | #endif |
3113 | .add_interface = iwl_mac_add_interface, | 3115 | .add_interface = iwlagn_mac_add_interface, |
3114 | .remove_interface = iwl_mac_remove_interface, | 3116 | .remove_interface = iwlagn_mac_remove_interface, |
3115 | .change_interface = iwl_mac_change_interface, | 3117 | .change_interface = iwlagn_mac_change_interface, |
3116 | .config = iwlagn_mac_config, | 3118 | .config = iwlagn_mac_config, |
3117 | .configure_filter = iwlagn_configure_filter, | 3119 | .configure_filter = iwlagn_configure_filter, |
3118 | .set_key = iwlagn_mac_set_key, | 3120 | .set_key = iwlagn_mac_set_key, |
3119 | .update_tkip_key = iwlagn_mac_update_tkip_key, | 3121 | .update_tkip_key = iwlagn_mac_update_tkip_key, |
3120 | .set_rekey_data = iwlagn_mac_set_rekey_data, | 3122 | .set_rekey_data = iwlagn_mac_set_rekey_data, |
3121 | .conf_tx = iwl_mac_conf_tx, | 3123 | .conf_tx = iwlagn_mac_conf_tx, |
3122 | .bss_info_changed = iwlagn_bss_info_changed, | 3124 | .bss_info_changed = iwlagn_bss_info_changed, |
3123 | .ampdu_action = iwlagn_mac_ampdu_action, | 3125 | .ampdu_action = iwlagn_mac_ampdu_action, |
3124 | .hw_scan = iwl_mac_hw_scan, | 3126 | .hw_scan = iwlagn_mac_hw_scan, |
3125 | .sta_notify = iwlagn_mac_sta_notify, | 3127 | .sta_notify = iwlagn_mac_sta_notify, |
3126 | .sta_add = iwlagn_mac_sta_add, | 3128 | .sta_add = iwlagn_mac_sta_add, |
3127 | .sta_remove = iwl_mac_sta_remove, | 3129 | .sta_remove = iwlagn_mac_sta_remove, |
3128 | .channel_switch = iwlagn_mac_channel_switch, | 3130 | .channel_switch = iwlagn_mac_channel_switch, |
3129 | .flush = iwlagn_mac_flush, | 3131 | .flush = iwlagn_mac_flush, |
3130 | .tx_last_beacon = iwl_mac_tx_last_beacon, | 3132 | .tx_last_beacon = iwlagn_mac_tx_last_beacon, |
3131 | .remain_on_channel = iwl_mac_remain_on_channel, | 3133 | .remain_on_channel = iwlagn_mac_remain_on_channel, |
3132 | .cancel_remain_on_channel = iwl_mac_cancel_remain_on_channel, | 3134 | .cancel_remain_on_channel = iwlagn_mac_cancel_remain_on_channel, |
3133 | .rssi_callback = iwl_mac_rssi_callback, | 3135 | .rssi_callback = iwlagn_mac_rssi_callback, |
3134 | CFG80211_TESTMODE_CMD(iwl_testmode_cmd) | 3136 | CFG80211_TESTMODE_CMD(iwlagn_mac_testmode_cmd) |
3135 | CFG80211_TESTMODE_DUMP(iwl_testmode_dump) | 3137 | CFG80211_TESTMODE_DUMP(iwlagn_mac_testmode_dump) |
3136 | .tx_sync = iwl_mac_tx_sync, | 3138 | .tx_sync = iwlagn_mac_tx_sync, |
3137 | .finish_tx_sync = iwl_mac_finish_tx_sync, | 3139 | .finish_tx_sync = iwlagn_mac_finish_tx_sync, |
3138 | .set_tim = iwl_mac_set_tim, | 3140 | .set_tim = iwlagn_mac_set_tim, |
3139 | }; | 3141 | }; |
3140 | 3142 | ||
3141 | static u32 iwl_hw_detect(struct iwl_priv *priv) | 3143 | static u32 iwl_hw_detect(struct iwl_priv *priv) |
@@ -3378,7 +3380,7 @@ void __devexit iwl_remove(struct iwl_priv * priv) | |||
3378 | 3380 | ||
3379 | iwl_dbgfs_unregister(priv); | 3381 | iwl_dbgfs_unregister(priv); |
3380 | 3382 | ||
3381 | /* ieee80211_unregister_hw call wil cause iwl_mac_stop to | 3383 | /* ieee80211_unregister_hw call wil cause iwlagn_mac_stop to |
3382 | * to be called and iwl_down since we are removing the device | 3384 | * to be called and iwl_down since we are removing the device |
3383 | * we need to set STATUS_EXIT_PENDING bit. | 3385 | * we need to set STATUS_EXIT_PENDING bit. |
3384 | */ | 3386 | */ |
@@ -3404,7 +3406,7 @@ void __devexit iwl_remove(struct iwl_priv * priv) | |||
3404 | /*netif_stop_queue(dev); */ | 3406 | /*netif_stop_queue(dev); */ |
3405 | flush_workqueue(priv->shrd->workqueue); | 3407 | flush_workqueue(priv->shrd->workqueue); |
3406 | 3408 | ||
3407 | /* ieee80211_unregister_hw calls iwl_mac_stop, which flushes | 3409 | /* ieee80211_unregister_hw calls iwlagn_mac_stop, which flushes |
3408 | * priv->shrd->workqueue... so we can't take down the workqueue | 3410 | * priv->shrd->workqueue... so we can't take down the workqueue |
3409 | * until now... */ | 3411 | * until now... */ |
3410 | destroy_workqueue(priv->shrd->workqueue); | 3412 | destroy_workqueue(priv->shrd->workqueue); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 2a297d1e6bc..a8df7eb596c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -252,20 +252,22 @@ extern int iwlagn_init_alive_start(struct iwl_priv *priv); | |||
252 | extern int iwl_alive_start(struct iwl_priv *priv); | 252 | extern int iwl_alive_start(struct iwl_priv *priv); |
253 | /* svtool */ | 253 | /* svtool */ |
254 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | 254 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL |
255 | extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len); | 255 | extern int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, |
256 | extern int iwl_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | 256 | int len); |
257 | struct netlink_callback *cb, | 257 | extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, |
258 | void *data, int len); | 258 | struct sk_buff *skb, |
259 | struct netlink_callback *cb, | ||
260 | void *data, int len); | ||
259 | extern void iwl_testmode_init(struct iwl_priv *priv); | 261 | extern void iwl_testmode_init(struct iwl_priv *priv); |
260 | extern void iwl_testmode_cleanup(struct iwl_priv *priv); | 262 | extern void iwl_testmode_cleanup(struct iwl_priv *priv); |
261 | #else | 263 | #else |
262 | static inline | 264 | static inline |
263 | int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | 265 | int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) |
264 | { | 266 | { |
265 | return -ENOSYS; | 267 | return -ENOSYS; |
266 | } | 268 | } |
267 | static inline | 269 | static inline |
268 | int iwl_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | 270 | int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, |
269 | struct netlink_callback *cb, | 271 | struct netlink_callback *cb, |
270 | void *data, int len) | 272 | void *data, int len) |
271 | { | 273 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 20e56eca34d..f8007560143 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -804,7 +804,7 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) | |||
804 | { | 804 | { |
805 | /* | 805 | /* |
806 | * MULTI-FIXME | 806 | * MULTI-FIXME |
807 | * See iwl_mac_channel_switch. | 807 | * See iwlagn_mac_channel_switch. |
808 | */ | 808 | */ |
809 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 809 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
810 | 810 | ||
@@ -1123,7 +1123,7 @@ int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear) | |||
1123 | &statistics_cmd); | 1123 | &statistics_cmd); |
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | int iwl_mac_conf_tx(struct ieee80211_hw *hw, | 1126 | int iwlagn_mac_conf_tx(struct ieee80211_hw *hw, |
1127 | struct ieee80211_vif *vif, u16 queue, | 1127 | struct ieee80211_vif *vif, u16 queue, |
1128 | const struct ieee80211_tx_queue_params *params) | 1128 | const struct ieee80211_tx_queue_params *params) |
1129 | { | 1129 | { |
@@ -1170,7 +1170,7 @@ int iwl_mac_conf_tx(struct ieee80211_hw *hw, | |||
1170 | return 0; | 1170 | return 0; |
1171 | } | 1171 | } |
1172 | 1172 | ||
1173 | int iwl_mac_tx_last_beacon(struct ieee80211_hw *hw) | 1173 | int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw) |
1174 | { | 1174 | { |
1175 | struct iwl_priv *priv = hw->priv; | 1175 | struct iwl_priv *priv = hw->priv; |
1176 | 1176 | ||
@@ -1223,7 +1223,8 @@ static int iwl_setup_interface(struct iwl_priv *priv, | |||
1223 | return 0; | 1223 | return 0; |
1224 | } | 1224 | } |
1225 | 1225 | ||
1226 | int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) | 1226 | int iwlagn_mac_add_interface(struct ieee80211_hw *hw, |
1227 | struct ieee80211_vif *vif) | ||
1227 | { | 1228 | { |
1228 | struct iwl_priv *priv = hw->priv; | 1229 | struct iwl_priv *priv = hw->priv; |
1229 | struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; | 1230 | struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; |
@@ -1319,7 +1320,7 @@ static void iwl_teardown_interface(struct iwl_priv *priv, | |||
1319 | priv->bt_traffic_load = priv->last_bt_traffic_load; | 1320 | priv->bt_traffic_load = priv->last_bt_traffic_load; |
1320 | } | 1321 | } |
1321 | 1322 | ||
1322 | void iwl_mac_remove_interface(struct ieee80211_hw *hw, | 1323 | void iwlagn_mac_remove_interface(struct ieee80211_hw *hw, |
1323 | struct ieee80211_vif *vif) | 1324 | struct ieee80211_vif *vif) |
1324 | { | 1325 | { |
1325 | struct iwl_priv *priv = hw->priv; | 1326 | struct iwl_priv *priv = hw->priv; |
@@ -1651,8 +1652,9 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external) | |||
1651 | return 0; | 1652 | return 0; |
1652 | } | 1653 | } |
1653 | 1654 | ||
1654 | int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 1655 | int iwlagn_mac_change_interface(struct ieee80211_hw *hw, |
1655 | enum nl80211_iftype newtype, bool newp2p) | 1656 | struct ieee80211_vif *vif, |
1657 | enum nl80211_iftype newtype, bool newp2p) | ||
1656 | { | 1658 | { |
1657 | struct iwl_priv *priv = hw->priv; | 1659 | struct iwl_priv *priv = hw->priv; |
1658 | struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif); | 1660 | struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 080c3554388..151cc43ec51 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -236,10 +236,10 @@ struct iwl_cfg { | |||
236 | * L i b * | 236 | * L i b * |
237 | ***************************/ | 237 | ***************************/ |
238 | 238 | ||
239 | int iwl_mac_conf_tx(struct ieee80211_hw *hw, | 239 | int iwlagn_mac_conf_tx(struct ieee80211_hw *hw, |
240 | struct ieee80211_vif *vif, u16 queue, | 240 | struct ieee80211_vif *vif, u16 queue, |
241 | const struct ieee80211_tx_queue_params *params); | 241 | const struct ieee80211_tx_queue_params *params); |
242 | int iwl_mac_tx_last_beacon(struct ieee80211_hw *hw); | 242 | int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw); |
243 | void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | 243 | void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx, |
244 | int hw_decrypt); | 244 | int hw_decrypt); |
245 | int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx); | 245 | int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx); |
@@ -259,11 +259,11 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv, | |||
259 | void iwl_connection_init_rx_config(struct iwl_priv *priv, | 259 | void iwl_connection_init_rx_config(struct iwl_priv *priv, |
260 | struct iwl_rxon_context *ctx); | 260 | struct iwl_rxon_context *ctx); |
261 | void iwl_set_rate(struct iwl_priv *priv); | 261 | void iwl_set_rate(struct iwl_priv *priv); |
262 | int iwl_mac_add_interface(struct ieee80211_hw *hw, | 262 | int iwlagn_mac_add_interface(struct ieee80211_hw *hw, |
263 | struct ieee80211_vif *vif); | 263 | struct ieee80211_vif *vif); |
264 | void iwl_mac_remove_interface(struct ieee80211_hw *hw, | 264 | void iwlagn_mac_remove_interface(struct ieee80211_hw *hw, |
265 | struct ieee80211_vif *vif); | 265 | struct ieee80211_vif *vif); |
266 | int iwl_mac_change_interface(struct ieee80211_hw *hw, | 266 | int iwlagn_mac_change_interface(struct ieee80211_hw *hw, |
267 | struct ieee80211_vif *vif, | 267 | struct ieee80211_vif *vif, |
268 | enum nl80211_iftype newtype, bool newp2p); | 268 | enum nl80211_iftype newtype, bool newp2p); |
269 | int iwl_cmd_echo_test(struct iwl_priv *priv); | 269 | int iwl_cmd_echo_test(struct iwl_priv *priv); |
@@ -322,7 +322,7 @@ void iwl_init_scan_params(struct iwl_priv *priv); | |||
322 | int iwl_scan_cancel(struct iwl_priv *priv); | 322 | int iwl_scan_cancel(struct iwl_priv *priv); |
323 | void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); | 323 | void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); |
324 | void iwl_force_scan_end(struct iwl_priv *priv); | 324 | void iwl_force_scan_end(struct iwl_priv *priv); |
325 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, | 325 | int iwlagn_mac_hw_scan(struct ieee80211_hw *hw, |
326 | struct ieee80211_vif *vif, | 326 | struct ieee80211_vif *vif, |
327 | struct cfg80211_scan_request *req); | 327 | struct cfg80211_scan_request *req); |
328 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); | 328 | void iwl_internal_short_hw_scan(struct iwl_priv *priv); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 1d781bc6066..2581c3cbfb5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -154,7 +154,7 @@ static int iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, | |||
154 | struct iwl_csa_notification *csa = &(pkt->u.csa_notif); | 154 | struct iwl_csa_notification *csa = &(pkt->u.csa_notif); |
155 | /* | 155 | /* |
156 | * MULTI-FIXME | 156 | * MULTI-FIXME |
157 | * See iwl_mac_channel_switch. | 157 | * See iwlagn_mac_channel_switch. |
158 | */ | 158 | */ |
159 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 159 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
160 | struct iwl_rxon_cmd *rxon = (void *)&ctx->active; | 160 | struct iwl_rxon_cmd *rxon = (void *)&ctx->active; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index c5c95d5319b..55f1f86796a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -940,7 +940,7 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, | |||
940 | return 0; | 940 | return 0; |
941 | } | 941 | } |
942 | 942 | ||
943 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, | 943 | int iwlagn_mac_hw_scan(struct ieee80211_hw *hw, |
944 | struct ieee80211_vif *vif, | 944 | struct ieee80211_vif *vif, |
945 | struct cfg80211_scan_request *req) | 945 | struct cfg80211_scan_request *req) |
946 | { | 946 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 07b72f2a21a..586007ee3a8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -815,7 +815,7 @@ int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
815 | return ret; | 815 | return ret; |
816 | } | 816 | } |
817 | 817 | ||
818 | int iwl_mac_sta_remove(struct ieee80211_hw *hw, | 818 | int iwlagn_mac_sta_remove(struct ieee80211_hw *hw, |
819 | struct ieee80211_vif *vif, | 819 | struct ieee80211_vif *vif, |
820 | struct ieee80211_sta *sta) | 820 | struct ieee80211_sta *sta) |
821 | { | 821 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h index b86c8937f5d..73b4af268c3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.h +++ b/drivers/net/wireless/iwlwifi/iwl-sta.h | |||
@@ -52,7 +52,7 @@ int iwl_add_station_common(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
52 | struct ieee80211_sta *sta, u8 *sta_id_r); | 52 | struct ieee80211_sta *sta, u8 *sta_id_r); |
53 | int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id, | 53 | int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id, |
54 | const u8 *addr); | 54 | const u8 *addr); |
55 | int iwl_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 55 | int iwlagn_mac_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
56 | struct ieee80211_sta *sta); | 56 | struct ieee80211_sta *sta); |
57 | 57 | ||
58 | u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | 58 | u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sv-open.c b/drivers/net/wireless/iwlwifi/iwl-sv-open.c index 1d1622dffb3..5e50d88f302 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sv-open.c +++ b/drivers/net/wireless/iwlwifi/iwl-sv-open.c | |||
@@ -641,7 +641,7 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb) | |||
641 | * @data: pointer to user space message | 641 | * @data: pointer to user space message |
642 | * @len: length in byte of @data | 642 | * @len: length in byte of @data |
643 | */ | 643 | */ |
644 | int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | 644 | int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) |
645 | { | 645 | { |
646 | struct nlattr *tb[IWL_TM_ATTR_MAX]; | 646 | struct nlattr *tb[IWL_TM_ATTR_MAX]; |
647 | struct iwl_priv *priv = hw->priv; | 647 | struct iwl_priv *priv = hw->priv; |
@@ -706,7 +706,7 @@ int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | |||
706 | return result; | 706 | return result; |
707 | } | 707 | } |
708 | 708 | ||
709 | int iwl_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | 709 | int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, |
710 | struct netlink_callback *cb, | 710 | struct netlink_callback *cb, |
711 | void *data, int len) | 711 | void *data, int len) |
712 | { | 712 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 2abd07ff96c..8e8c75c997e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -1372,8 +1372,9 @@ static int iwl_trans_pcie_suspend(struct iwl_trans *trans) | |||
1372 | { | 1372 | { |
1373 | /* | 1373 | /* |
1374 | * This function is called when system goes into suspend state | 1374 | * This function is called when system goes into suspend state |
1375 | * mac80211 will call iwl_mac_stop() from the mac80211 suspend function | 1375 | * mac80211 will call iwlagn_mac_stop() from the mac80211 suspend |
1376 | * first but since iwl_mac_stop() has no knowledge of who the caller is, | 1376 | * function first but since iwlagn_mac_stop() has no knowledge of |
1377 | * who the caller is, | ||
1377 | * it will not call apm_ops.stop() to stop the DMA operation. | 1378 | * it will not call apm_ops.stop() to stop the DMA operation. |
1378 | * Calling apm_ops.stop here to make sure we stop the DMA. | 1379 | * Calling apm_ops.stop here to make sure we stop the DMA. |
1379 | * | 1380 | * |