Commit dc21b545 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: make mac80211 ops a device config 



In the future, 4965 and modern AGN devices will
need to have different mac80211 callbacks since
they have different capabilities. Prepare for
that by making the mac80211 operations a device
config.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 07caf9d6

drivers/net/wireless/iwlwifi/iwl-1000.c

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static const struct iwl_ops iwl1000_ops = { 
	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl1000_base_params = {

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −0
Original line number Diff line number Diff line
@@ -2753,6 +2753,7 @@ static const struct iwl_ops iwl3945_ops = { 
	.hcmd = &iwl3945_hcmd,

	.utils = &iwl3945_hcmd_utils,

	.led = &iwl3945_led_ops,

	.ieee80211_ops = &iwl3945_hw_ops,

};



static struct iwl_base_params iwl3945_base_params = {

drivers/net/wireless/iwlwifi/iwl-3945.h

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ extern int iwl3945_commit_rxon(struct iwl_priv *priv, 
 */

extern u8 iwl3945_hw_find_station(struct iwl_priv *priv, const u8 *bssid);



extern struct ieee80211_ops iwl3945_hw_ops;



/*

 * Forward declare iwl-3945.c functions for iwl-base.c

 */

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −0
Original line number Diff line number Diff line
@@ -2305,6 +2305,7 @@ static const struct iwl_ops iwl4965_ops = { 
	.hcmd = &iwl4965_hcmd,

	.utils = &iwl4965_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl4965_base_params = {

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ static const struct iwl_ops iwl5000_ops = { 
	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl5150_ops = {
@@ -492,6 +493,7 @@ static const struct iwl_ops iwl5150_ops = { 
	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl5000_base_params = {