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

Commit 864792e3 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: fix iwl_mac_add_interface handler 



This patch fixes iwl_mac_add_interface.

1. Currently only one interface is supported, instead of silently retuning
 0 now it returns  -EOPNOTSUPP (By Johannes Berg)
2. It enables changing mac address from user space (By Ian Schram)

Signed-off-by: default avatarTomas Winkler <tomas@localhost.localdomain>
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org
Cc: Ian Schram <ischram@telenet.be>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6591e36a

drivers/net/wireless/iwlwifi/iwl3945-base.c

+7 −4
Original line number Diff line number Diff line
@@ -6940,13 +6940,10 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);

	if (conf->mac_addr)

		IWL_DEBUG_MAC80211("enter: MAC %s\n",

				   print_mac(mac, conf->mac_addr));



	if (priv->interface_id) {

		IWL_DEBUG_MAC80211("leave - interface_id != 0\n");

		return 0;

		return -EOPNOTSUPP;

	}



	spin_lock_irqsave(&priv->lock, flags);
@@ -6955,6 +6952,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	spin_unlock_irqrestore(&priv->lock, flags);



	mutex_lock(&priv->mutex);



	if (conf->mac_addr) {

		IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));

		memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);

	}



	iwl_set_mode(priv, conf->type);



	IWL_DEBUG_MAC80211("leave\n");

drivers/net/wireless/iwlwifi/iwl4965-base.c

+5 −3
Original line number Diff line number Diff line
@@ -7330,9 +7330,6 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);

	if (conf->mac_addr)

		IWL_DEBUG_MAC80211("enter: MAC %s\n",

				   print_mac(mac, conf->mac_addr));



	if (priv->interface_id) {

		IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7345,6 +7342,11 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	spin_unlock_irqrestore(&priv->lock, flags);



	mutex_lock(&priv->mutex);



	if (conf->mac_addr) {

		IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));

		memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);

	}

	iwl_set_mode(priv, conf->type);



	IWL_DEBUG_MAC80211("leave\n");