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

Commit 0753bba2 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: Add ESSID specific scanning for Agere fw 



Pass the ESSID to the card.

This allows 'iwlist eth1 scan essid <essid>' to work, and will help
with routers setup not to broadcast the ESSID.

Signed-off-by: default avatarDavid Kilroy <kilroyd@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9859b81e

drivers/net/wireless/orinoco.c

+19 −1
Original line number Diff line number Diff line
@@ -2982,6 +2982,11 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev, 
	range->min_r_time = 0;

	range->max_r_time = 65535 * 1000;	/* ??? */



	if (priv->firmware_type == FIRMWARE_TYPE_AGERE)

		range->scan_capa = IW_SCAN_CAPA_ESSID;

	else

		range->scan_capa = IW_SCAN_CAPA_NONE;



	/* Event capability (kernel) */

	IW_EVENT_CAPA_SET_KERNEL(range->event_capa);

	/* Event capability (driver) */
@@ -3951,6 +3956,7 @@ static int orinoco_ioctl_setscan(struct net_device *dev, 
{

	struct orinoco_private *priv = netdev_priv(dev);

	hermes_t *hw = &priv->hw;

	struct iw_scan_req *si = (struct iw_scan_req *) extra;

	int err = 0;

	unsigned long flags;
@@ -4012,6 +4018,18 @@ static int orinoco_ioctl_setscan(struct net_device *dev, 
		}

		break;

		case FIRMWARE_TYPE_AGERE:

			if (priv->scan_mode & IW_SCAN_THIS_ESSID) {

				struct hermes_idstring idbuf;

				size_t len = min(sizeof(idbuf.val),

						 (size_t) si->essid_len);

				idbuf.len = cpu_to_le16(len);

				memcpy(idbuf.val, si->essid, len);



				err = hermes_write_ltv(hw, USER_BAP,

					       HERMES_RID_CNFSCANSSID_AGERE,

					       HERMES_BYTES_TO_RECLEN(len + 2),

					       &idbuf);

			} else

				err = hermes_write_wordrec(hw, USER_BAP,

						   HERMES_RID_CNFSCANSSID_AGERE,

						   0);	/* Any ESSID */