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

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

iwl3945: remove dead code 



Was wondering about this code since supposedly the firmware will
add the SSID element. Turns out it's dead, so remove it.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e5704bf0

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

+2 −16
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static u16 iwl3945_supported_rate_to_ie(u8 *ie, u16 supported_rate, 
 */

static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv,

			      struct ieee80211_mgmt *frame,

			      int left, int is_direct)

			      int left)

{

	int len = 0;

	u8 *pos = NULL;
@@ -1623,20 +1623,6 @@ static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv, 
	*pos++ = WLAN_EID_SSID;

	*pos++ = 0;



	/* fill in our direct SSID IE... */

	if (is_direct) {

		/* ...next IE... */

		left -= 2 + priv->essid_len;

		if (left < 0)

			return 0;

		/* ... fill it in... */

		*pos++ = WLAN_EID_SSID;

		*pos++ = priv->essid_len;

		memcpy(pos, priv->essid, priv->essid_len);

		pos += priv->essid_len;

		len += 2 + priv->essid_len;

	}



	/* fill in supported rate */

	/* ...next IE... */

	left -= 2;
@@ -6177,7 +6163,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
	 * that based on the direct_mask added to each channel entry */

	scan->tx_cmd.len = cpu_to_le16(

		iwl3945_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data,

			IWL_MAX_SCAN_SIZE - sizeof(*scan), 0));

			IWL_MAX_SCAN_SIZE - sizeof(*scan)));

	scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;

	scan->tx_cmd.sta_id = priv->hw_setting.bcast_sta_id;

	scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;