Merge tag 'mac80211-next-for-davem-2015-08-14' into next

[linux] / drivers / net / wireless / iwlwifi / dvm / dev.h

diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 074977e..0ba3e56 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -680,9 +680,8 @@ struct iwl_priv {
        enum ieee80211_band band;
        u8 valid_contexts;
 
-       int (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
-                                      struct iwl_rx_cmd_buffer *rxb,
-                                      struct iwl_device_cmd *cmd);
+       void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
+                                      struct iwl_rx_cmd_buffer *rxb);
 
        struct iwl_notif_wait_data notif_wait;