Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (23779897) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/ps3_gelic_wireless.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -30,10 +30,11 @@
		#include <linux/ip.h>
		#include <linux/tcp.h>
		#include <linux/wireless.h>
		#include <linux/ieee80211.h>
		#include <linux/if_arp.h>
		#include <linux/ctype.h>
		#include <linux/string.h>
		#include <net/iw_handler.h>
		#include <net/ieee80211.h>

		#include <linux/dma-mapping.h>
		#include <net/checksum.h>
		@@ -449,9 +450,9 @@ static size_t gelic_wl_synthesize_ie(u8 *buf,

		/* element id */
		if (rsn)
		*buf++ = MFIE_TYPE_RSN;
		*buf++ = WLAN_EID_RSN;
		else
		*buf++ = MFIE_TYPE_GENERIC;
		*buf++ = WLAN_EID_GENERIC;

		/* length filed; set later */
		buf++;
		@@ -539,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
		break;

		switch (item_id) {
		case MFIE_TYPE_GENERIC:
		case WLAN_EID_GENERIC:
		if ((OUI_LEN + 1 <= item_len) &&
		!memcmp(pos, wpa_oui, OUI_LEN) &&
		pos[OUI_LEN] == 0x01) {
		@@ -547,7 +548,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
		ie_info->wpa.len = item_len + 2;
		}
		break;
		case MFIE_TYPE_RSN:
		case WLAN_EID_RSN:
		ie_info->rsn.data = pos - 2;
		/* length includes the header */
		ie_info->rsn.len = item_len + 2;
		@@ -581,7 +582,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		char *tmp;
		u8 rate;
		unsigned int i, j, len;
		u8 buf[MAX_WPA_IE_LEN];
		u8 buf[64]; /* arbitrary size large enough */

		pr_debug("%s: <-\n", __func__);

		@@ -1734,14 +1735,14 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
		target->essid_len = strnlen(scan_info->essid,
		sizeof(scan_info->essid));
		target->rate_len = 0;
		for (r = 0; r < MAX_RATES_LENGTH; r++)
		for (r = 0; r < 12; r++)
		if (scan_info->rate[r])
		target->rate_len++;
		if (8 < target->rate_len)
		pr_info("%s: AP returns %d rates\n", __func__,
		target->rate_len);
		target->rate_ext_len = 0;
		for (r = 0; r < MAX_RATES_EX_LENGTH; r++)
		for (r = 0; r < 16; r++)
		if (scan_info->ext_rate[r])
		target->rate_ext_len++;
		list_move_tail(&target->list, &wl->network_list);

drivers/net/ps3_gelic_wireless.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -164,8 +164,8 @@ struct gelic_eurus_scan_info {
		__be16 security;
		u8 bssid[8]; /* last ETH_ALEN are valid. bssid[0],[1] are unused */
		u8 essid[32]; /* IW_ESSID_MAX_SIZE */
		u8 rate[16]; /* first MAX_RATES_LENGTH(12) are valid */
		u8 ext_rate[16]; /* first MAX_RATES_EX_LENGTH(16) are valid */
		u8 rate[16]; /* first 12 are valid */
		u8 ext_rate[16]; /* first 16 are valid */
		__be32 reserved1;
		__be32 reserved2;
		__be32 reserved3;

drivers/net/wireless/Makefile

+1 −8

Original line number	Diff line number	Diff line
		@@ -16,14 +16,7 @@ obj-$(CONFIG_WAVELAN) += wavelan.o
		obj-$(CONFIG_PCMCIA_NETWAVE) += netwave_cs.o
		obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan_cs.o

		obj-$(CONFIG_HERMES) += orinoco.o hermes.o hermes_dld.o
		obj-$(CONFIG_PCMCIA_HERMES) += orinoco_cs.o
		obj-$(CONFIG_APPLE_AIRPORT) += airport.o
		obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o
		obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o
		obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o
		obj-$(CONFIG_NORTEL_HERMES) += orinoco_nortel.o
		obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o
		obj-$(CONFIG_HERMES) += orinoco/

		obj-$(CONFIG_AIRO) += airo.o
		obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o

drivers/net/wireless/adm8211.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -1297,22 +1297,6 @@ static void adm8211_set_bssid(struct ieee80211_hw dev, const u8 bssid)
		ADM8211_CSR_WRITE(ABDA1, reg);
		}

		static int adm8211_set_ssid(struct ieee80211_hw dev, u8 ssid, size_t ssid_len)
		{
		struct adm8211_priv *priv = dev->priv;
		u8 buf[36];

		if (ssid_len > 32)
		return -EINVAL;

		memset(buf, 0, sizeof(buf));
		buf[0] = ssid_len;
		memcpy(buf + 1, ssid, ssid_len);
		adm8211_write_sram_bytes(dev, ADM8211_SRAM_SSID, buf, 33);
		/* TODO: configure beacon for adhoc? */
		return 0;
		}

		static int adm8211_config(struct ieee80211_hw *dev, u32 changed)
		{
		struct adm8211_priv *priv = dev->priv;
		@@ -1338,13 +1322,6 @@ static int adm8211_config_interface(struct ieee80211_hw *dev,
		memcpy(priv->bssid, conf->bssid, ETH_ALEN);
		}

		if (conf->ssid_len != priv->ssid_len \|\|
		memcmp(conf->ssid, priv->ssid, conf->ssid_len)) {
		adm8211_set_ssid(dev, conf->ssid, conf->ssid_len);
		priv->ssid_len = conf->ssid_len;
		memcpy(priv->ssid, conf->ssid, conf->ssid_len);
		}

		return 0;
		}

drivers/net/wireless/adm8211.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -553,8 +553,6 @@ struct adm8211_priv {

		int channel;
		u8 bssid[ETH_ALEN];
		u8 ssid[32];
		size_t ssid_len;

		u8 soft_rx_crc;
		u8 retry_limit;