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

Commit c89cc225 authored by Pavel Roskin's avatar Pavel Roskin Committed by Jeff Garzik
Browse files

[PATCH] orinoco: Optimize orinoco_join_ap() 



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>

diff-tree cb289b9f9b2a0f3ae7070a008f22e383b37526ee (from 56bfcdb38b3d04c1f8c1fd705e411f4be53b663c)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 19:05:16 2005 -0400

    Optimize orinoco_join_ap() - break from loop once the requested
BSSID
    is found.
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 708218b0

drivers/net/wireless/orinoco.c

+11 −7
Original line number Diff line number Diff line
@@ -1053,8 +1053,9 @@ static void orinoco_join_ap(struct net_device *dev) 
		u16 channel;

	} __attribute__ ((packed)) req;

	const int atom_len = offsetof(struct prism2_scan_apinfo, atim);

	struct prism2_scan_apinfo *atom;

	struct prism2_scan_apinfo *atom = NULL;

	int offset = 4;

	int found = 0;

	u8 *buf;

	u16 len;
@@ -1089,15 +1090,18 @@ static void orinoco_join_ap(struct net_device *dev) 
	 * we were requested to join */

	for (; offset + atom_len <= len; offset += atom_len) {

		atom = (struct prism2_scan_apinfo *) (buf + offset);

		if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0)

			goto found;

		if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0) {

			found = 1;

			break;

		}

	}



	if (! found) {

		DEBUG(1, "%s: Requested AP not found in scan results\n",

		      dev->name);

		goto out;

	}



 found:

	memcpy(req.bssid, priv->desired_bssid, ETH_ALEN);

	req.channel = atom->channel;	/* both are little-endian */

	err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST,