Commit db21e578 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of... 

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
parents 6ed14254 df8ccb9b

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -2768,7 +2768,7 @@ static int airo_test_wpa_capable(struct airo_info *ai) 


	/* Only firmware versions 5.30.17 or better can do WPA */

	if ((cap_rid.softVer > 0x530)

	  || ((cap_rid.softVer == 0x530) && (cap_rid.softSubVer >= 0x17))) {

	  || ((cap_rid.softVer == 0x530) && (cap_rid.softSubVer >= 17))) {

		airo_print_info(name, "WPA is supported.");

		return 1;

	}

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+5 −3
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging."); 
	{ PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	/* Broadcom 4318 802.11b/g */

	{ PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	/* Broadcom 4319 802.11a/b/g */

	{ PCI_VENDOR_ID_BROADCOM, 0x4319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	/* Broadcom 4306 802.11b/g */

	{ PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	/* Broadcom 4306 802.11a */

drivers/net/wireless/hostap/hostap_80211_tx.c

+0 −1
Original line number Diff line number Diff line
@@ -534,5 +534,4 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev) 
}





EXPORT_SYMBOL(hostap_dump_tx_80211);

EXPORT_SYMBOL(hostap_master_start_xmit);

drivers/net/wireless/hostap/hostap_ap.c

+0 −11
Original line number Diff line number Diff line
@@ -3276,17 +3276,6 @@ EXPORT_SYMBOL(hostap_init_data); 
EXPORT_SYMBOL(hostap_init_ap_proc);

EXPORT_SYMBOL(hostap_free_data);

EXPORT_SYMBOL(hostap_check_sta_fw_version);

EXPORT_SYMBOL(hostap_handle_sta_tx);

EXPORT_SYMBOL(hostap_handle_sta_release);

EXPORT_SYMBOL(hostap_handle_sta_tx_exc);

EXPORT_SYMBOL(hostap_update_sta_ps);

EXPORT_SYMBOL(hostap_handle_sta_rx);

EXPORT_SYMBOL(hostap_is_sta_assoc);

EXPORT_SYMBOL(hostap_is_sta_authorized);

EXPORT_SYMBOL(hostap_add_sta);

EXPORT_SYMBOL(hostap_update_rates);

EXPORT_SYMBOL(hostap_add_wds_links);

EXPORT_SYMBOL(hostap_wds_link_oper);

#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT

EXPORT_SYMBOL(hostap_deauth_all_stas);

#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */

drivers/net/wireless/hostap/hostap_cs.c

+6 −0
Original line number Diff line number Diff line
@@ -881,6 +881,12 @@ static struct pcmcia_device_id hostap_cs_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12(

		"ZoomAir 11Mbps High", "Rate wireless Networking",

		0x273fe3db, 0x32a1eaee),

	PCMCIA_DEVICE_PROD_ID123(

		"Pretec", "CompactWLAN Card 802.11b", "2.5",

		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),

	PCMCIA_DEVICE_PROD_ID123(

		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",

		0xc7b8df9d, 0x1700d087, 0x4b74baa0),

	PCMCIA_DEVICE_NULL

};

MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE