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

Commit 9b7c8489 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents eff4b1fe 4edac92f

drivers/net/wireless/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,15 @@ config NET_RADIO 
	  the tools from

	  the tools from

	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.

	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.





config NET_WIRELESS_RTNETLINK

	bool "Wireless Extension API over RtNetlink"

	---help---

	  Support the Wireless Extension API over the RtNetlink socket

	  in addition to the traditional ioctl interface (selected above).



	  For now, few tools use this facility, but it might grow in the

	  future. The only downside is that it adds 4.5 kB to your kernel.



# Note : the cards are obsolete (can't buy them anymore), but the drivers

# Note : the cards are obsolete (can't buy them anymore), but the drivers

# are not, as people are still using them...

# are not, as people are still using them...

comment "Obsolete Wireless cards support (pre-802.11)"

comment "Obsolete Wireless cards support (pre-802.11)"

drivers/net/wireless/airo.c

+294 −161

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/hostap/hostap_ap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3141,7 +3141,7 @@ int hostap_add_sta(struct ap_data *ap, u8 *sta_addr) 
	if (ret == 1) {

	if (ret == 1) {

		sta = ap_add_sta(ap, sta_addr);

		sta = ap_add_sta(ap, sta_addr);

		if (!sta)

		if (!sta)

			ret = -1;

			return -1;

		sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;

		sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;

		sta->ap = 1;

		sta->ap = 1;

		memset(sta->supported_rates, 0, sizeof(sta->supported_rates));

		memset(sta->supported_rates, 0, sizeof(sta->supported_rates));

drivers/net/wireless/hostap/hostap_cs.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -585,8 +585,6 @@ static int prism2_config(dev_link_t *link) 
	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);

	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);

	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);

	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);

	if (parse == NULL || hw_priv == NULL) {

	if (parse == NULL || hw_priv == NULL) {

		kfree(parse);

		kfree(hw_priv);

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto failed;

		goto failed;

	}

	}

drivers/net/wireless/hostap/hostap_hw.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -928,15 +928,15 @@ static int hfa384x_set_rid(struct net_device *dev, u16 rid, void *buf, int len) 




	res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL);

	res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL);

	up(&local->rid_bap_sem);

	up(&local->rid_bap_sem);



	if (res) {

	if (res) {

		printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE "

		printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE "

		       "failed (res=%d, rid=%04x, len=%d)\n",

		       "failed (res=%d, rid=%04x, len=%d)\n",

		       dev->name, res, rid, len);

		       dev->name, res, rid, len);

		return res;

	}





		if (res == -ETIMEDOUT)

		if (res == -ETIMEDOUT)

			prism2_hw_reset(dev);

			prism2_hw_reset(dev);

	}





	return res;

	return res;

}

}