net-wireless/broadcom-sta: Fixed to work.

3 files changed, 106 insertions, 2 deletions

diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 65ce07e..5b36089 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,7 +1,8 @@
+AUX broadcom-sta-5.10.27.11-gentoo.patch 4025 RMD160 b6ca22ecbd9bbe1e58a3f6da680b6fd5a3935cc8 SHA1 565ea7163c5abb7ad5f244eafc5e7b388afe1962 SHA256 d0f7f6e9cc88899247f10c2353936c4b54f6b85479db2ee2f85afaeed876ea7d
 AUX broadcom-sta-5.10.27.6-gentoo.patch 3962 RMD160 f856c79a4bcacc0dba5068d968d2f07a078e8acc SHA1 163b8bfebc56c9410cb5e3766d5f2fe3ce720588 SHA256 4d0d2f63974312067e47ca946b1e491e09c183a8377a1749abe093aaee4ab526
 DIST hybrid-portsrc-x86-32_5_10_27_11.tar.gz 526895 RMD160 d5b364dd806b2d720e0490967d7c684e74e1ee0c SHA1 96e1c9bdf8b00e37be96cf255bce8778ef1d555e SHA256 d96997258a8c573b43fc50fa39810c6d1531df46219ccd0773dca9d59715e4b0
 DIST hybrid-portsrc-x86-64_5_10_27_11.tar.gz 525609 RMD160 2e53810451479c4318dc8de57bf906dbd8be7795 SHA1 f1f26116c638b1c2fc5201f6dd94fbf433aeaf4b SHA256 7359fb48595f3bf21bf4636ef7da9c88e8cb5fba0cccea59b2e8c2c2ad77c131
 DIST hybrid-portsrc-x86_32_5_10_27_6.tar.gz 523655 RMD160 b5d42ec69821cb2272cba693af4423d9e41e084d SHA1 88035832af2a56eabdc3f070cd8f668423b62ff1 SHA256 0772dcd51659112a62379b61f6525d9038d640057f3c66d6354ee67bb222ef7e
 DIST hybrid-portsrc-x86_64_5_10_27_6.tar.gz 521899 RMD160 a85ec25c0196e3b2b97e904e19b0a42f3e05a829 SHA1 d9546198d294bf2c837f675a6c77735487fd9d11 SHA256 1be5400eec995d276e6a14e35ab94edd1fa79fb19b43e33226b7bf931405af29
-EBUILD broadcom-sta-5.10.27.11.ebuild 994 RMD160 8e60052cf2fafb3eaccd5d1493ac9f1e4debc3b0 SHA1 2876d2a50ac868251dd503bf5579d75b46e1031d SHA256 af471939b33552871bab755a339302288ac6d2d7409cf27959b983ada5dc9b85
+EBUILD broadcom-sta-5.10.27.11.ebuild 983 RMD160 9932b976a7e2512116b863448b77196120b59b14 SHA1 fdcbe74999fb910880d11c0de7a70e625f9819e9 SHA256 c01df7fcc6706978f7b100ffd845755ef8fd2804d507149749b0ee5531ffd691
 EBUILD broadcom-sta-5.10.27.6.ebuild 983 RMD160 e9ecf1379ec18f49d6052a313b59124e6b4a6e37 SHA1 ccd5ae816bd8ed53f38c884f560ba8b9a6b96c8c SHA256 a15953a48b76317edb2951af37ede35e7723135786f22c1fc3f8ca1815ace40e
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.27.11.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.27.11.ebuild
index 7844bac..ef69220 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.27.11.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.27.11.ebuild
@@ -33,5 +33,5 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-5.10.27.6-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.27.11-gentoo.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.27.11-gentoo.patch
new file mode 100644
index 0000000..a451e64
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.27.11-gentoo.patch
@@ -0,0 +1,103 @@
+diff -Naur broadcom-sta-5.10.27.11.orig/src/wl/sys/wl_iw.c broadcom-sta-5.10.27.11/src/wl/sys/wl_iw.c
+--- broadcom-sta-5.10.27.11.orig/src/wl/sys/wl_iw.c	2008-12-06 04:41:46.000000000 +0900
++++ broadcom-sta-5.10.27.11/src/wl/sys/wl_iw.c	2008-12-23 02:53:47.000000000 +0900
+@@ -893,6 +893,14 @@
+ }

+ #endif 

+ 

++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)

++#define	iwe_stream_add_event(a, b, c, d, e)	iwe_stream_add_event(b, c, d, e)

++#define	iwe_stream_add_point(a, b, c, d, e)	iwe_stream_add_point(b, c, d, e)

++#define	iwe_stream_add_value(a, b, c, d, e, f)	\

++	iwe_stream_add_value(b, c, d, e, f)

++#endif

++

++

+ static int

+ wl_iw_get_scan(

+ 	struct net_device *dev,

+@@ -943,12 +951,12 @@
+ 		iwe.cmd = SIOCGIWAP;

+ 		iwe.u.ap_addr.sa_family = ARPHRD_ETHER;

+ 		memcpy(iwe.u.ap_addr.sa_data, &bi->BSSID, ETHER_ADDR_LEN);

+-		event = iwe_stream_add_event(event, end, &iwe, IW_EV_ADDR_LEN);

++		event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_ADDR_LEN);

+ 

+ 		iwe.u.data.length = dtoh32(bi->SSID_len);

+ 		iwe.cmd = SIOCGIWESSID;

+ 		iwe.u.data.flags = 1;

+-		event = iwe_stream_add_point(event, end, &iwe, bi->SSID);

++		event = iwe_stream_add_point(info, event, end, &iwe, bi->SSID);

+ 

+ 		if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {

+ 			iwe.cmd = SIOCGIWMODE;

+@@ -956,7 +964,7 @@
+ 				iwe.u.mode = IW_MODE_INFRA;

+ 			else

+ 				iwe.u.mode = IW_MODE_ADHOC;

+-			event = iwe_stream_add_event(event, end, &iwe, IW_EV_UINT_LEN);

++			event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_UINT_LEN);

+ 		}

+ 

+ 		iwe.cmd = SIOCGIWFREQ;

+@@ -964,13 +972,13 @@
+ 			CHSPEC_CHANNEL(bi->chanspec) <= CH_MAX_2G_CHANNEL ?

+ 			WF_CHAN_FACTOR_2_4_G : WF_CHAN_FACTOR_5_G);

+ 		iwe.u.freq.e = 6;

+-		event = iwe_stream_add_event(event, end, &iwe, IW_EV_FREQ_LEN);

++		event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_FREQ_LEN);

+ 

+ 		iwe.cmd = IWEVQUAL;

+ 		iwe.u.qual.qual = rssi_to_qual(dtoh16(bi->RSSI));

+ 		iwe.u.qual.level = 0x100 + dtoh16(bi->RSSI);

+ 		iwe.u.qual.noise = 0x100 + bi->phy_noise;

+-		event = iwe_stream_add_event(event, end, &iwe, IW_EV_QUAL_LEN);

++		event = iwe_stream_add_event(info, event, end, &iwe, IW_EV_QUAL_LEN);

+ 

+ #if WIRELESS_EXT > 17

+ 

+@@ -982,7 +990,7 @@
+ 			if ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_RSN_ID))) {

+ 				iwe.cmd = IWEVGENIE;

+ 				iwe.u.data.length = ie->len + 2;

+-				event = iwe_stream_add_point(event, end, &iwe, (char *)ie);

++				event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);

+ 			}

+ 			ptr = ((uint8 *)bi) + sizeof(wl_bss_info_t);

+ 			while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) {

+@@ -990,7 +998,7 @@
+ 			    if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) {

+ 				iwe.cmd = IWEVGENIE;

+ 				iwe.u.data.length = ie->len + 2;

+-				event = iwe_stream_add_point(event, end, &iwe, (char *)ie);

++				event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);

+ 				break;

+ 			    }

+ 			}

+@@ -1001,7 +1009,7 @@
+ 				if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) {

+ 					iwe.cmd = IWEVGENIE;

+ 					iwe.u.data.length = ie->len + 2;

+-					event = iwe_stream_add_point(event, end, &iwe, (char *)ie);

++					event = iwe_stream_add_point(info, event, end, &iwe, (char *)ie);

+ 					goto done;

+ 				}

+ 			}

+@@ -1015,7 +1023,7 @@
+ 		else

+ 			iwe.u.data.flags = IW_ENCODE_DISABLED;

+ 		iwe.u.data.length = 0;

+-		event = iwe_stream_add_point(event, end, &iwe, (char *)event);

++		event = iwe_stream_add_point(info, event, end, &iwe, (char *)event);

+ 

+ 		if (bi->rateset.count) {

+ 			value = event + IW_EV_LCP_LEN;

+@@ -1024,7 +1032,7 @@
+ 			iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;

+ 			for (j = 0; j < bi->rateset.count && j < IW_MAX_BITRATES; j++) {

+ 				iwe.u.bitrate.value = (bi->rateset.rates[j] & 0x7f) * 500000;

+-				value = iwe_stream_add_value(event, value, end, &iwe,

++				value = iwe_stream_add_value(info, event, value, end, &iwe,

+ 					IW_EV_PARAM_LEN);

+ 			}

+ 			event = value;