Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6 (1839cea9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/ps3_gelic_wireless.c

+16 −14

Original line number	Diff line number	Diff line
		@@ -571,6 +571,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
		* independent format
		*/
		static char gelic_wl_translate_scan(struct net_device netdev,
		struct iw_request_info *info,
		char *ev,
		char *stop,
		struct gelic_wl_scan_info *network)
		@@ -588,26 +589,26 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		iwe.cmd = SIOCGIWAP;
		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
		memcpy(iwe.u.ap_addr.sa_data, &scan->bssid[2], ETH_ALEN);
		ev = iwe_stream_add_event(ev, stop, &iwe, IW_EV_ADDR_LEN);
		ev = iwe_stream_add_event(info, ev, stop, &iwe, IW_EV_ADDR_LEN);

		/* ESSID */
		iwe.cmd = SIOCGIWESSID;
		iwe.u.data.flags = 1;
		iwe.u.data.length = strnlen(scan->essid, 32);
		ev = iwe_stream_add_point(ev, stop, &iwe, scan->essid);
		ev = iwe_stream_add_point(info, ev, stop, &iwe, scan->essid);

		/* FREQUENCY */
		iwe.cmd = SIOCGIWFREQ;
		iwe.u.freq.m = be16_to_cpu(scan->channel);
		iwe.u.freq.e = 0; /* table value in MHz */
		iwe.u.freq.i = 0;
		ev = iwe_stream_add_event(ev, stop, &iwe, IW_EV_FREQ_LEN);
		ev = iwe_stream_add_event(info, ev, stop, &iwe, IW_EV_FREQ_LEN);

		/* RATES */
		iwe.cmd = SIOCGIWRATE;
		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
		/* to stuff multiple values in one event */
		tmp = ev + IW_EV_LCP_LEN;
		tmp = ev + iwe_stream_lcp_len(info);
		/* put them in ascendant order (older is first) */
		i = 0;
		j = 0;
		@@ -620,16 +621,16 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		else
		rate = scan->rate[i++] & 0x7f;
		iwe.u.bitrate.value = rate * 500000; /* 500kbps unit */
		tmp = iwe_stream_add_value(ev, tmp, stop, &iwe,
		tmp = iwe_stream_add_value(info, ev, tmp, stop, &iwe,
		IW_EV_PARAM_LEN);
		}
		while (j < network->rate_ext_len) {
		iwe.u.bitrate.value = (scan->ext_rate[j++] & 0x7f) * 500000;
		tmp = iwe_stream_add_value(ev, tmp, stop, &iwe,
		tmp = iwe_stream_add_value(info, ev, tmp, stop, &iwe,
		IW_EV_PARAM_LEN);
		}
		/* Check if we added any rate */
		if (IW_EV_LCP_LEN < (tmp - ev))
		if (iwe_stream_lcp_len(info) < (tmp - ev))
		ev = tmp;

		/* ENCODE */
		@@ -639,7 +640,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		else
		iwe.u.data.flags = IW_ENCODE_DISABLED;
		iwe.u.data.length = 0;
		ev = iwe_stream_add_point(ev, stop, &iwe, scan->essid);
		ev = iwe_stream_add_point(info, ev, stop, &iwe, scan->essid);

		/* MODE */
		iwe.cmd = SIOCGIWMODE;
		@@ -649,7 +650,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		iwe.u.mode = IW_MODE_MASTER;
		else
		iwe.u.mode = IW_MODE_ADHOC;
		ev = iwe_stream_add_event(ev, stop, &iwe, IW_EV_UINT_LEN);
		ev = iwe_stream_add_event(info, ev, stop, &iwe, IW_EV_UINT_LEN);
		}

		/* QUAL */
		@@ -659,7 +660,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		iwe.u.qual.level = be16_to_cpu(scan->rssi);
		iwe.u.qual.qual = be16_to_cpu(scan->rssi);
		iwe.u.qual.noise = 0;
		ev = iwe_stream_add_event(ev, stop, &iwe, IW_EV_QUAL_LEN);
		ev = iwe_stream_add_event(info, ev, stop, &iwe, IW_EV_QUAL_LEN);

		/* RSN */
		memset(&iwe, 0, sizeof(iwe));
		@@ -669,7 +670,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		if (len) {
		iwe.cmd = IWEVGENIE;
		iwe.u.data.length = len;
		ev = iwe_stream_add_point(ev, stop, &iwe, buf);
		ev = iwe_stream_add_point(info, ev, stop, &iwe, buf);
		}
		} else {
		/* this scan info has IE data */
		@@ -684,7 +685,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		memcpy(buf, ie_info.wpa.data, ie_info.wpa.len);
		iwe.cmd = IWEVGENIE;
		iwe.u.data.length = ie_info.wpa.len;
		ev = iwe_stream_add_point(ev, stop, &iwe, buf);
		ev = iwe_stream_add_point(info, ev, stop, &iwe, buf);
		}

		if (ie_info.rsn.len && (ie_info.rsn.len <= sizeof(buf))) {
		@@ -692,7 +693,7 @@ static char gelic_wl_translate_scan(struct net_device netdev,
		memcpy(buf, ie_info.rsn.data, ie_info.rsn.len);
		iwe.cmd = IWEVGENIE;
		iwe.u.data.length = ie_info.rsn.len;
		ev = iwe_stream_add_point(ev, stop, &iwe, buf);
		ev = iwe_stream_add_point(info, ev, stop, &iwe, buf);
		}
		}

		@@ -737,7 +738,8 @@ static int gelic_wl_get_scan(struct net_device *netdev,
		if (wl->scan_age == 0 \|\|
		time_after(scan_info->last_scanned + wl->scan_age,
		this_time))
		ev = gelic_wl_translate_scan(netdev, ev, stop,
		ev = gelic_wl_translate_scan(netdev, info,
		ev, stop,
		scan_info);
		else
		pr_debug("%s:entry too old\n", __func__);

drivers/net/wireless/airo.c

+28 −15

Original line number	Diff line number	Diff line
		@@ -7156,6 +7156,7 @@ out:
		* format that the Wireless Tools will understand - Jean II
		*/
		static inline char airo_translate_scan(struct net_device dev,
		struct iw_request_info *info,
		char *current_ev,
		char *end_buf,
		BSSListRid *bss)
		@@ -7172,7 +7173,8 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.cmd = SIOCGIWAP;
		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
		memcpy(iwe.u.ap_addr.sa_data, bss->bssid, ETH_ALEN);
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_ADDR_LEN);

		/* Other entries will be displayed in the order we give them */

		@@ -7182,7 +7184,8 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.u.data.length = 32;
		iwe.cmd = SIOCGIWESSID;
		iwe.u.data.flags = 1;
		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->ssid);
		current_ev = iwe_stream_add_point(info, current_ev, end_buf,
		&iwe, bss->ssid);

		/* Add mode */
		iwe.cmd = SIOCGIWMODE;
		@@ -7192,7 +7195,8 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.u.mode = IW_MODE_MASTER;
		else
		iwe.u.mode = IW_MODE_ADHOC;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_UINT_LEN);
		}

		/* Add frequency */
		@@ -7203,7 +7207,8 @@ static inline char airo_translate_scan(struct net_device dev,
		*/
		iwe.u.freq.m = frequency_list[iwe.u.freq.m - 1] * 100000;
		iwe.u.freq.e = 1;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_FREQ_LEN);

		dBm = le16_to_cpu(bss->dBm);

		@@ -7223,7 +7228,8 @@ static inline char airo_translate_scan(struct net_device dev,
		\| IW_QUAL_DBM;
		}
		iwe.u.qual.noise = ai->wstats.qual.noise;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_QUAL_LEN);

		/* Add encryption capability */
		iwe.cmd = SIOCGIWENCODE;
		@@ -7232,11 +7238,12 @@ static inline char airo_translate_scan(struct net_device dev,
		else
		iwe.u.data.flags = IW_ENCODE_DISABLED;
		iwe.u.data.length = 0;
		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->ssid);
		current_ev = iwe_stream_add_point(info, current_ev, end_buf,
		&iwe, bss->ssid);

		/* Rate : stuffing multiple values in a single event require a bit
		* more of magic - Jean II */
		current_val = current_ev + IW_EV_LCP_LEN;
		current_val = current_ev + iwe_stream_lcp_len(info);

		iwe.cmd = SIOCGIWRATE;
		/* Those two flags are ignored... */
		@@ -7249,10 +7256,12 @@ static inline char airo_translate_scan(struct net_device dev,
		/* Bit rate given in 500 kb/s units (+ 0x80) */
		iwe.u.bitrate.value = ((bss->rates[i] & 0x7f) * 500000);
		/* Add new value to event */
		current_val = iwe_stream_add_value(current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN);
		current_val = iwe_stream_add_value(info, current_ev,
		current_val, end_buf,
		&iwe, IW_EV_PARAM_LEN);
		}
		/* Check if we added any event */
		if((current_val - current_ev) > IW_EV_LCP_LEN)
		if ((current_val - current_ev) > iwe_stream_lcp_len(info))
		current_ev = current_val;

		/* Beacon interval */
		@@ -7261,7 +7270,8 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.cmd = IWEVCUSTOM;
		sprintf(buf, "bcn_int=%d", bss->beaconInterval);
		iwe.u.data.length = strlen(buf);
		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
		current_ev = iwe_stream_add_point(info, current_ev, end_buf,
		&iwe, buf);
		kfree(buf);
		}

		@@ -7295,8 +7305,10 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.cmd = IWEVGENIE;
		iwe.u.data.length = min(info_element->len + 2,
		MAX_WPA_IE_LEN);
		current_ev = iwe_stream_add_point(current_ev, end_buf,
		&iwe, (char *) info_element);
		current_ev = iwe_stream_add_point(
		info, current_ev,
		end_buf, &iwe,
		(char *) info_element);
		}
		break;

		@@ -7304,7 +7316,8 @@ static inline char airo_translate_scan(struct net_device dev,
		iwe.cmd = IWEVGENIE;
		iwe.u.data.length = min(info_element->len + 2,
		MAX_WPA_IE_LEN);
		current_ev = iwe_stream_add_point(current_ev, end_buf,
		current_ev = iwe_stream_add_point(
		info, current_ev, end_buf,
		&iwe, (char *) info_element);
		break;

		@@ -7344,7 +7357,7 @@ static int airo_get_scan(struct net_device *dev,

		list_for_each_entry (net, &ai->network_list, list) {
		/* Translate to WE format this entry */
		current_ev = airo_translate_scan(dev, current_ev,
		current_ev = airo_translate_scan(dev, info, current_ev,
		extra + dwrq->length,
		&net->bss);

drivers/net/wireless/atmel.c

+18 −6

Original line number	Diff line number	Diff line
		@@ -2310,30 +2310,40 @@ static int atmel_get_scan(struct net_device *dev,
		iwe.cmd = SIOCGIWAP;
		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
		memcpy(iwe.u.ap_addr.sa_data, priv->BSSinfo[i].BSSID, 6);
		current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_ADDR_LEN);
		current_ev = iwe_stream_add_event(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, IW_EV_ADDR_LEN);

		iwe.u.data.length = priv->BSSinfo[i].SSIDsize;
		if (iwe.u.data.length > 32)
		iwe.u.data.length = 32;
		iwe.cmd = SIOCGIWESSID;
		iwe.u.data.flags = 1;
		current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, priv->BSSinfo[i].SSID);
		current_ev = iwe_stream_add_point(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, priv->BSSinfo[i].SSID);

		iwe.cmd = SIOCGIWMODE;
		iwe.u.mode = priv->BSSinfo[i].BSStype;
		current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_UINT_LEN);
		current_ev = iwe_stream_add_event(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, IW_EV_UINT_LEN);

		iwe.cmd = SIOCGIWFREQ;
		iwe.u.freq.m = priv->BSSinfo[i].channel;
		iwe.u.freq.e = 0;
		current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, IW_EV_FREQ_LEN);
		current_ev = iwe_stream_add_event(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, IW_EV_FREQ_LEN);

		/* Add quality statistics */
		iwe.cmd = IWEVQUAL;
		iwe.u.qual.level = priv->BSSinfo[i].RSSI;
		iwe.u.qual.qual = iwe.u.qual.level;
		/* iwe.u.qual.noise = SOMETHING */
		current_ev = iwe_stream_add_event(current_ev, extra + IW_SCAN_MAX_DATA , &iwe, IW_EV_QUAL_LEN);
		current_ev = iwe_stream_add_event(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, IW_EV_QUAL_LEN);


		iwe.cmd = SIOCGIWENCODE;
		@@ -2342,7 +2352,9 @@ static int atmel_get_scan(struct net_device *dev,
		else
		iwe.u.data.flags = IW_ENCODE_DISABLED;
		iwe.u.data.length = 0;
		current_ev = iwe_stream_add_point(current_ev, extra + IW_SCAN_MAX_DATA, &iwe, NULL);
		current_ev = iwe_stream_add_point(info, current_ev,
		extra + IW_SCAN_MAX_DATA,
		&iwe, NULL);
		}

		/* Length of data */

drivers/net/wireless/hostap/hostap.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,8 @@ void * ap_crypt_get_ptrs(struct ap_data ap, u8 addr, int permanent,
		int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
		struct iw_quality qual[], int buf_size,
		int aplist);
		int prism2_ap_translate_scan(struct net_device dev, char buffer);
		int prism2_ap_translate_scan(struct net_device *dev,
		struct iw_request_info info, char buffer);
		int prism2_hostapd(struct ap_data ap, struct prism2_hostapd_param param);

drivers/net/wireless/hostap/hostap_ap.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -2420,7 +2420,8 @@ int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],

		/* Translate our list of Access Points & Stations to a card independant
		* format that the Wireless Tools will understand - Jean II */
		int prism2_ap_translate_scan(struct net_device dev, char buffer)
		int prism2_ap_translate_scan(struct net_device *dev,
		struct iw_request_info info, char buffer)
		{
		struct hostap_interface *iface;
		local_info_t *local;
		@@ -2449,8 +2450,8 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
		memcpy(iwe.u.ap_addr.sa_data, sta->addr, ETH_ALEN);
		iwe.len = IW_EV_ADDR_LEN;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
		IW_EV_ADDR_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_ADDR_LEN);

		/* Use the mode to indicate if it's a station or
		* an Access Point */
		@@ -2461,8 +2462,8 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		else
		iwe.u.mode = IW_MODE_INFRA;
		iwe.len = IW_EV_UINT_LEN;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
		IW_EV_UINT_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_UINT_LEN);

		/* Some quality */
		memset(&iwe, 0, sizeof(iwe));
		@@ -2477,8 +2478,8 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
		iwe.u.qual.updated = sta->last_rx_updated;
		iwe.len = IW_EV_QUAL_LEN;
		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
		IW_EV_QUAL_LEN);
		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
		&iwe, IW_EV_QUAL_LEN);

		#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
		if (sta->ap) {
		@@ -2486,8 +2487,8 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		iwe.cmd = SIOCGIWESSID;
		iwe.u.data.length = sta->u.ap.ssid_len;
		iwe.u.data.flags = 1;
		current_ev = iwe_stream_add_point(current_ev, end_buf,
		&iwe,
		current_ev = iwe_stream_add_point(info, current_ev,
		end_buf, &iwe,
		sta->u.ap.ssid);

		memset(&iwe, 0, sizeof(iwe));
		@@ -2497,10 +2498,9 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		IW_ENCODE_ENABLED \| IW_ENCODE_NOKEY;
		else
		iwe.u.data.flags = IW_ENCODE_DISABLED;
		current_ev = iwe_stream_add_point(current_ev, end_buf,
		&iwe,
		sta->u.ap.ssid
		/* 0 byte memcpy */);
		current_ev = iwe_stream_add_point(info, current_ev,
		end_buf, &iwe,
		sta->u.ap.ssid);

		if (sta->u.ap.channel > 0 &&
		sta->u.ap.channel <= FREQ_COUNT) {
		@@ -2510,7 +2510,7 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		* 100000;
		iwe.u.freq.e = 1;
		current_ev = iwe_stream_add_event(
		current_ev, end_buf, &iwe,
		info, current_ev, end_buf, &iwe,
		IW_EV_FREQ_LEN);
		}

		@@ -2519,8 +2519,8 @@ int prism2_ap_translate_scan(struct net_device dev, char buffer)
		sprintf(buf, "beacon_interval=%d",
		sta->listen_interval);
		iwe.u.data.length = strlen(buf);
		current_ev = iwe_stream_add_point(current_ev, end_buf,
		&iwe, buf);
		current_ev = iwe_stream_add_point(info, current_ev,
		end_buf, &iwe, buf);
		}
		#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */