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

Commit 19e8bc7f authored by Jason Andryuk's avatar Jason Andryuk Committed by John W. Linville
Browse files

at76c50x-usb: update to latest mac80211 hw scan api 

With the latest mac80211 stack, the driver needs to be updated for
cfg80211 scanning.  I based the changes off of modifications for
at76_usb found here:

http://johannes.sipsolutions.net/patches/old/all/2008-09-19-13:35/020-cfg80211-scan.patch



The trick was that max_signal also needs to be set to avoid a divide
by zero Oops.  I just guessed and used the value 100 for now.

kvalo: handpicked the change from two different patches

Signed-off-by: default avatarJason Andryuk <jandryuk@gmail.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1264b951

drivers/net/wireless/at76c50x-usb.c

+18 −6
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static void at76_dwork_hw_scan(struct work_struct *work) 
		goto exit;

	}



	ieee80211_scan_completed(priv->hw);

	ieee80211_scan_completed(priv->hw, false);



	if (is_valid_ether_addr(priv->bssid))

		at76_join(priv);
@@ -1872,14 +1872,15 @@ static void at76_dwork_hw_scan(struct work_struct *work) 
	mutex_unlock(&priv->mtx);

}



static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)

static int at76_hw_scan(struct ieee80211_hw *hw,

			struct cfg80211_scan_request *req)

{

	struct at76_priv *priv = hw->priv;

	struct at76_req_scan scan;

	int ret;

	u8 *ssid = NULL;

	int ret, len = 0;



	at76_dbg(DBG_MAC80211, "%s():", __func__);

	at76_dbg_dump(DBG_MAC80211, ssid, len, "ssid %zd bytes:", len);



	mutex_lock(&priv->mtx);
@@ -1887,11 +1888,20 @@ static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) 


	memset(&scan, 0, sizeof(struct at76_req_scan));

	memset(scan.bssid, 0xFF, ETH_ALEN);



	if (req->n_ssids) {

		scan.scan_type = SCAN_TYPE_ACTIVE;

	if (priv->essid_size > 0) {

		ssid = req->ssids[0].ssid;

		len = req->ssids[0].ssid_len;

	} else {

		scan.scan_type = SCAN_TYPE_PASSIVE;

	}



	if (len) {

		memcpy(scan.essid, ssid, len);

		scan.essid_size = len;

	}



	scan.min_channel_time = cpu_to_le16(priv->scan_min_time);

	scan.max_channel_time = cpu_to_le16(priv->scan_max_time);

	scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
@@ -2217,10 +2227,12 @@ static int at76_init_new_device(struct at76_priv *priv, 
	priv->scan_mode = SCAN_TYPE_ACTIVE;



	/* mac80211 initialisation */

	priv->hw->wiphy->max_scan_ssids = 1;

	priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);

	priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &at76_supported_band;

	priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |

			  IEEE80211_HW_SIGNAL_UNSPEC;

	priv->hw->max_signal = 100;



	SET_IEEE80211_DEV(priv->hw, &interface->dev);

	SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);