Commit 1878f77e authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

Make ar9170 use common ath reg code 



Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f769c36b

drivers/net/wireless/ar9170/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config AR9170_USB 
	tristate "Atheros AR9170 802.11n USB support"

	depends on USB && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select FW_LOADER

	select ATH_COMMON

	help

	  This is a driver for the Atheros "otus" 802.11n USB devices.

drivers/net/wireless/ar9170/ar9170.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#include "eeprom.h"

#include "hw.h"



#include "../ath/regd.h"



#define PAYLOAD_MAX	(AR9170_MAX_CMD_LEN/4 - 1)



enum ar9170_bw {
@@ -151,6 +153,7 @@ struct ar9170 { 


	/* EEPROM */

	struct ar9170_eeprom eeprom;

	struct ath_regulatory regulatory;



	/* global tx status for unregistered Stations. */

	struct sk_buff_head global_tx_status;

drivers/net/wireless/ar9170/main.c

+18 −0
Original line number Diff line number Diff line
@@ -1620,12 +1620,24 @@ static int ar9170_read_eeprom(struct ar9170 *ar) 
	else

		ar->hw->channel_change_time = 80 * 1000;



	ar->regulatory.current_rd = le16_to_cpu(ar->eeprom.reg_domain[0]);

	ar->regulatory.current_rd_ext = le16_to_cpu(ar->eeprom.reg_domain[1]);



	/* second part of wiphy init */

	SET_IEEE80211_PERM_ADDR(ar->hw, addr);



	return bands ? 0 : -EINVAL;

}



static int ar9170_reg_notifier(struct wiphy *wiphy,

			struct regulatory_request *request)

{

	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);

	struct ar9170 *ar = hw->priv;



	return ath_reg_notifier_apply(wiphy, request, &ar->regulatory);

}



int ar9170_register(struct ar9170 *ar, struct device *pdev)

{

	int err;
@@ -1635,10 +1647,16 @@ int ar9170_register(struct ar9170 *ar, struct device *pdev) 
	if (err)

		goto err_out;



	err = ath_regd_init(&ar->regulatory, ar->hw->wiphy,

			    ar9170_reg_notifier);



	err = ieee80211_register_hw(ar->hw);

	if (err)

		goto err_out;



	if (!ath_is_world_regd(&ar->regulatory))

		regulatory_hint(ar->hw->wiphy, ar->regulatory.alpha2);



	err = ar9170_init_leds(ar);

	if (err)

		goto err_unreg;

drivers/net/wireless/ath/Kconfig

+1 −1
Original line number Diff line number Diff line 
config ATH_COMMON

	tristate "Atheros Wireless Cards Shared Support"

	depends on ATH5K || ATH9K

	depends on ATH5K || ATH9K || AR9170_USB