Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

iwlagn: make mac80211 handlers static 



Now that these handlers are no longer shared
between 4965 and agn, they can be static.

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 3240cab3

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

+27 −26
Original line number Diff line number Diff line
@@ -2921,7 +2921,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, 
}





int iwlagn_mac_start(struct ieee80211_hw *hw)

static int iwlagn_mac_start(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = hw->priv;

	int ret;
@@ -2962,7 +2962,7 @@ int iwlagn_mac_start(struct ieee80211_hw *hw) 
	return 0;

}



void iwlagn_mac_stop(struct ieee80211_hw *hw)

static void iwlagn_mac_stop(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = hw->priv;
@@ -2985,7 +2985,7 @@ void iwlagn_mac_stop(struct ieee80211_hw *hw) 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct iwl_priv *priv = hw->priv;
@@ -3000,7 +3000,7 @@ void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	IWL_DEBUG_MACDUMP(priv, "leave\n");

}



void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

				       struct ieee80211_vif *vif,

				       struct ieee80211_key_conf *keyconf,

				       struct ieee80211_sta *sta,
@@ -3017,8 +3017,9 @@ void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw, 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		       struct ieee80211_vif *vif, struct ieee80211_sta *sta,

static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

			      struct ieee80211_vif *vif,

			      struct ieee80211_sta *sta,

			      struct ieee80211_key_conf *key)

{

	struct iwl_priv *priv = hw->priv;
@@ -3094,7 +3095,7 @@ int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   enum ieee80211_ampdu_mlme_action action,

				   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
@@ -3205,7 +3206,7 @@ int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 
	return ret;

}



int iwlagn_mac_sta_add(struct ieee80211_hw *hw,

static int iwlagn_mac_sta_add(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      struct ieee80211_sta *sta)

{
@@ -3248,7 +3249,7 @@ int iwlagn_mac_sta_add(struct ieee80211_hw *hw, 
	return 0;

}



void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

				struct ieee80211_channel_switch *ch_switch)

{

	struct iwl_priv *priv = hw->priv;
@@ -3346,7 +3347,7 @@ void iwlagn_mac_channel_switch(struct ieee80211_hw *hw, 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



void iwlagn_configure_filter(struct ieee80211_hw *hw,

static void iwlagn_configure_filter(struct ieee80211_hw *hw,

				    unsigned int changed_flags,

				    unsigned int *total_flags,

				    u64 multicast)
@@ -3396,7 +3397,7 @@ void iwlagn_configure_filter(struct ieee80211_hw *hw, 
			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;

}



void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)

static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)

{

	struct iwl_priv *priv = hw->priv;

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

+0 −28
Original line number Diff line number Diff line
@@ -337,32 +337,4 @@ void __releases(wait_entry) 
iwlagn_remove_notification(struct iwl_priv *priv,

			   struct iwl_notification_wait *wait_entry);



/* mac80211 handlers (for 4965) */

void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);

int iwlagn_mac_start(struct ieee80211_hw *hw);

void iwlagn_mac_stop(struct ieee80211_hw *hw);

void iwlagn_configure_filter(struct ieee80211_hw *hw,

			     unsigned int changed_flags,

			     unsigned int *total_flags,

			     u64 multicast);

int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		       struct ieee80211_vif *vif, struct ieee80211_sta *sta,

		       struct ieee80211_key_conf *key);

void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_key_conf *keyconf,

				struct ieee80211_sta *sta,

				u32 iv32, u16 *phase1key);

int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

			    struct ieee80211_vif *vif,

			    enum ieee80211_ampdu_mlme_action action,

			    struct ieee80211_sta *sta, u16 tid, u16 *ssn,

			    u8 buf_size);

int iwlagn_mac_sta_add(struct ieee80211_hw *hw,

		       struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);

void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

			       struct ieee80211_channel_switch *ch_switch);

void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop);



#endif /* __iwl_agn_h__ */