Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Johannes Berg and committed by
John W. Linville
430cfe95 e5704bf0

+2 -16
+2 -16
drivers/net/wireless/iwlwifi/iwl3945-base.c
··· 1593 1593 */ 1594 1594 static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv, 1595 1595 struct ieee80211_mgmt *frame, 1596 - int left, int is_direct) 1596 + int left) 1597 1597 { 1598 1598 int len = 0; 1599 1599 u8 *pos = NULL; ··· 1622 1622 pos = &(frame->u.probe_req.variable[0]); 1623 1623 *pos++ = WLAN_EID_SSID; 1624 1624 *pos++ = 0; 1625 - 1626 - /* fill in our direct SSID IE... */ 1627 - if (is_direct) { 1628 - /* ...next IE... */ 1629 - left -= 2 + priv->essid_len; 1630 - if (left < 0) 1631 - return 0; 1632 - /* ... fill it in... */ 1633 - *pos++ = WLAN_EID_SSID; 1634 - *pos++ = priv->essid_len; 1635 - memcpy(pos, priv->essid, priv->essid_len); 1636 - pos += priv->essid_len; 1637 - len += 2 + priv->essid_len; 1638 - } 1639 1625 1640 1626 /* fill in supported rate */ 1641 1627 /* ...next IE... */ ··· 6163 6177 * that based on the direct_mask added to each channel entry */ 6164 6178 scan->tx_cmd.len = cpu_to_le16( 6165 6179 iwl3945_fill_probe_req(priv, (struct ieee80211_mgmt *)scan->data, 6166 - IWL_MAX_SCAN_SIZE - sizeof(*scan), 0)); 6180 + IWL_MAX_SCAN_SIZE - sizeof(*scan))); 6167 6181 scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK; 6168 6182 scan->tx_cmd.sta_id = priv->hw_setting.bcast_sta_id; 6169 6183 scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;