Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6 (0f1c122e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/wireless/airo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5783,7 +5783,7 @@ static int airo_get_essid(struct net_device *dev,
		/* If none, we may want to get the one that was set */

		/* Push it out ! */
		dwrq->length = status_rid.SSIDlen + 1;
		dwrq->length = status_rid.SSIDlen;
		dwrq->flags = 1; /* active */

		return 0;

drivers/net/wireless/atmel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1718,11 +1718,11 @@ static int atmel_get_essid(struct net_device *dev,
		if (priv->new_SSID_size != 0) {
		memcpy(extra, priv->new_SSID, priv->new_SSID_size);
		extra[priv->new_SSID_size] = '\0';
		dwrq->length = priv->new_SSID_size + 1;
		dwrq->length = priv->new_SSID_size;
		} else {
		memcpy(extra, priv->SSID, priv->SSID_size);
		extra[priv->SSID_size] = '\0';
		dwrq->length = priv->SSID_size + 1;
		dwrq->length = priv->SSID_size;
		}

		dwrq->flags = !priv->connect_to_any_BSS; /* active */

drivers/net/wireless/hostap/Kconfig

+18 −4

Original line number	Diff line number	Diff line
		@@ -26,11 +26,25 @@ config HOSTAP_FIRMWARE
		depends on HOSTAP
		---help---
		Configure Host AP driver to include support for firmware image
		download. Current version supports only downloading to volatile, i.e.,
		RAM memory. Flash upgrade is not yet supported.
		download. This option by itself only enables downloading to the
		volatile memory, i.e. the card RAM. This option is required to
		support cards that don't have firmware in flash, such as D-Link
		DWL-520 rev E and D-Link DWL-650 rev P.

		Firmware image downloading needs user space tool, prism2_srec. It is
		available from http://hostap.epitest.fi/.
		Firmware image downloading needs a user space tool, prism2_srec.
		It is available from http://hostap.epitest.fi/.

		config HOSTAP_FIRMWARE_NVRAM
		bool "Support for non-volatile firmware download"
		depends on HOSTAP_FIRMWARE
		---help---
		Allow Host AP driver to write firmware images to the non-volatile
		card memory, i.e. flash memory that survives power cycling.
		Enable this option if you want to be able to change card firmware
		permanently.

		Firmware image downloading needs a user space tool, prism2_srec.
		It is available from http://hostap.epitest.fi/.

		config HOSTAP_PLX
		tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors"

drivers/net/wireless/hostap/Makefile

+2 −1

Original line number	Diff line number	Diff line
		hostap-y := hostap_main.o
		hostap-y := hostap_80211_rx.o hostap_80211_tx.o hostap_ap.o hostap_info.o \
		hostap_ioctl.o hostap_main.o hostap_proc.o
		obj-$(CONFIG_HOSTAP) += hostap.o

		obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o

drivers/net/wireless/hostap/hostap.h

+37 −0

Original line number	Diff line number	Diff line
		#ifndef HOSTAP_H
		#define HOSTAP_H

		#include <linux/ethtool.h>

		#include "hostap_wlan.h"
		#include "hostap_ap.h"

		static const long freq_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
		2447, 2452, 2457, 2462, 2467, 2472, 2484 };
		#define FREQ_COUNT (sizeof(freq_list) / sizeof(freq_list[0]))

		/* hostap.c */

		extern struct proc_dir_entry *hostap_proc;
		@@ -40,6 +49,26 @@ int prism2_update_comms_qual(struct net_device *dev);
		int prism2_sta_send_mgmt(local_info_t local, u8 dst, u16 stype,
		u8 *body, size_t bodylen);
		int prism2_sta_deauth(local_info_t *local, u16 reason);
		int prism2_wds_add(local_info_t local, u8 remote_addr,
		int rtnl_locked);
		int prism2_wds_del(local_info_t local, u8 remote_addr,
		int rtnl_locked, int do_not_remove);


		/* hostap_ap.c */

		int ap_control_add_mac(struct mac_restrictions mac_restrictions, u8 mac);
		int ap_control_del_mac(struct mac_restrictions mac_restrictions, u8 mac);
		void ap_control_flush_macs(struct mac_restrictions *mac_restrictions);
		int ap_control_kick_mac(struct ap_data ap, struct net_device dev, u8 *mac);
		void ap_control_kickall(struct ap_data *ap);
		void * ap_crypt_get_ptrs(struct ap_data ap, u8 addr, int permanent,
		struct ieee80211_crypt_data ***crypt);
		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_hostapd(struct ap_data ap, struct prism2_hostapd_param param);


		/* hostap_proc.c */
		@@ -54,4 +83,12 @@ void hostap_info_init(local_info_t *local);
		void hostap_info_process(local_info_t local, struct sk_buff skb);


		/* hostap_ioctl.c */

		extern const struct iw_handler_def hostap_iw_handler_def;
		extern struct ethtool_ops prism2_ethtool_ops;

		int hostap_ioctl(struct net_device dev, struct ifreq ifr, int cmd);


		#endif /* HOSTAP_H */