Revision bump: add support for 3.10 kernels, wrt bug #477372. Patch submitted by Constantine Kozlov <tempor.demonius AT gmail.com>. Drop old revisions

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 127 insertions, 96 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index fe9fae438fa6..1ae9f15838d2 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.52 2013/05/12 10:52:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.53 2013/08/23 12:31:04 pinkbyte Exp $
+
+*broadcom-sta-6.30.223.30-r2 (23 Aug 2013)
+
+  23 Aug 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -broadcom-sta-6.30.223.30.ebuild, -broadcom-sta-6.30.223.30-r1.ebuild,
+  +broadcom-sta-6.30.223.30-r2.ebuild,
+  +files/broadcom-sta-6.30.223.30-linux-3.10.0.patch:
+  Revision bump: add support for 3.10 kernels, wrt bug #477372. Patch submitted
+  by Constantine Kozlov <tempor.demonius AT gmail.com>. Drop old revisions
 
   12 May 2013; Sergey Popov <pinkbyte@gentoo.org>
   broadcom-sta-5.100.82.112-r2.ebuild:
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 6ef914f52d4f..a814b1d5d53c 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -12,6 +12,7 @@ AUX broadcom-sta-5.100.82.112-linux-3.8.patch 2503 SHA256 01bd90f9dd9b80ecc4b1b3
 AUX broadcom-sta-5.100.82.112-linux-3.9.patch 420 SHA256 9f8229e27a5d1f34deb3e956d1819ba09b39e2eb71bf15e110e41ca9275109ad SHA512 a902239d709f6aafff719beea4e1c1d97fb43e5d37743b70e70a8fc59610ee5e1329bbea7b45968f426b6d97d1ed03866de94e77deb36f70831e595ed71d2db6 WHIRLPOOL c82b711082889730cd057448246e1809f5007da2e26f643ff90b9f69385af0675f3da022e4afa8fe5ea9bfeb51faa4b888b5901b1441fa597f7d3734950ae8f2
 AUX broadcom-sta-5.100.82.112-remove-rssi-errors.patch 1284 SHA256 0a83f0bc58afdf48e97d69d1a2e30fd862e37ea5140fd3fbb7f644b858e43f79 SHA512 9e2a94a4367961e1e815b480d7b5aebd0ee9e32d2ce2b4a7e4d82dcf2cce47b11cb09a9e5c01ecc3035ea373e97d5e2d46d458ad4d204df67533cf14852cffc8 WHIRLPOOL 54791f855815a516a989df4298127cd6cc06f3b0ab611ddd32624d735fd81a31b1402ba1bb1cbc7ed015aa0494309e918cce14535f850134c4e615ff03d0511c
 AUX broadcom-sta-5.100.82.38-gcc.patch 417 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736 SHA512 d271493861fedf937be6f534fab1eaec95e7db3324583bfafb52445d1a5001c07d596fac88b150c7bd83e02d0095ad2867dc2f0ffbcfb320f4536d557d4a663e WHIRLPOOL 32b270e795503b5cb97c2407b472b62a93efffb14f2147680f45ad063839aa59526baadc72e9eeab424f1d36f236fd0e1bc40ae7ea9477d0dc2c043445fa7fc7
+AUX broadcom-sta-6.30.223.30-linux-3.10.0.patch 2916 SHA256 ae3006413c98516ca70c2e15610b4cd0a892bcd0813d019bc87816060415bdf8 SHA512 a57a75a83b0e8cbb1bcb0ecc99830a3e01d24ed89a55e44aeb8d8e5c45d958518374c42c2377be0964258232cdd9bb91516b4c9741bdf633870798ee52ca550d WHIRLPOOL dc34ad9a01823b620e38298841c6a85adfb24dc06adee1dd77419dd216509c58eba07d40a74c301806727b6f5ebd224effe6e463f22a727f5c61eb99268499ab
 AUX broadcom-sta-6.30.223.30-linux-3.9.0.patch 397 SHA256 d000f4d30a816368ad040f2271e019c8116c687d65999267b91d91eb73c63016 SHA512 600ea6d99096c4eba38ff29bdcff0c334bb4d6c6c98613a824d8fffc878992db9219d131e3bf1fe5c93f272df850f13b1d14b41a3402083733d337a882f01834 WHIRLPOOL 41d7b189840a7b68d5132388b8909438933d31803dd5bfa0abd61057636dd037c58865df4140ba76a73f32089f221ea5f6f5f3ba60f6047145551511892edb60
 AUX broadcom-sta-6.30.223.30-makefile.patch 497 SHA256 3f1332be115991f21b03cf50de0af212faa8083017bf8ba724f110c602005060 SHA512 f403669dede71f3c9f2886bfa535518a9e89a4398d1da7789ff955f15c493dd5ede1f304b0980c300c580ac1ae2464a4e395fb40b72dffa98a5a015c3e7d74c5 WHIRLPOOL 9bad191388f78608d1cc7f13488dcf9dbcfe626a6522af3bf477aa46a2e7736921d48ab78750fa2e3b3aff10cd353a12a7a331b159988d263e5fd3fdb4b2a77f
 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2
@@ -20,18 +21,17 @@ DIST hybrid-portsrc_x86_32-v5_100_82_112.tar.gz 1139221 SHA256 85b4e3163b383943d
 DIST hybrid-portsrc_x86_64-v5_100_82_112.tar.gz 1175410 SHA256 9cd32f164c748b4353f10a74f3b00640bb281e4b79f17114aac581e0b3cd4ae3 SHA512 485c4a661c30ebc076499f48d468ef30afdd5fdfd6458f4cd25fceaf15969f33e46695a173908d05e635a572efc152b5ae973493d53d5b4089335b03b0ba9a6d WHIRLPOOL 2e3259d3fde1830aeddf8ee38a070f891c0acb167bfe99d623b6102f1bc8ee8f3f776efc6370b1067063eea2069a93e5678e6ea3b3ab054e7d4d30b9f5db8f46
 EBUILD broadcom-sta-5.100.82.112-r2.ebuild 1987 SHA256 eb7f7df0d8683df60d112c66fa02850a965d7b3ba3bf55e22ec71277fcfd7e43 SHA512 a31320ac4175e4b5851b7de07de2355db06088ef0de205a59f9b982a4dc0a818e0b95cc0adccad594f702ffe2ddc7be8ad2eaa6e56423aeb6da26c5927dfad31 WHIRLPOOL 687fad4e062068b418a07a8c3c8aa16ffc4eadb964001cefecba98d93261b069f24ce8ddadb4491b1f290513bbc1f93c2a4844000db8a3d8b404ec3f06e5b046
 EBUILD broadcom-sta-5.100.82.112-r3.ebuild 2798 SHA256 e991c667833e8cc8cf155542f7516aa9e69f2bc2e52d04ef09f63ae8760b1ad3 SHA512 0fd87beec50cf4a291d8c050aecb7ddbf6e4e2a56fac323e79afa4a77074beecefda3c64088e0f863b0ce683be08fc9a9f3c9ae34460d9687e52b02b4c73e265 WHIRLPOOL d49ed3eb47356515f5cd8533ea1b8cccd675306dd6a9c1a20e391a2b62fe1efd1122c1e41bcee56a9aaddbabf6a7cc4f423380b2bd6e10928dfaa98be39189be
-EBUILD broadcom-sta-6.30.223.30-r1.ebuild 3084 SHA256 fc0a13d30c3bf55a15f1c1892c1601689a976bde2788f811db221a8178609e50 SHA512 bd2c3ba740bcef1a4e1cafa6745499e2e0e783109d8b41d0143b5b2fc020b4f155b0c47b35e1fe20dace7ad258c3303ffce224ff9ca4c26766fce3e3e60ab8fa WHIRLPOOL 621b9f55c6b32867056004caa53ff812f19411aed0c8b43c1617aa69dd410d4b76a6b415823804f4b2f0517238530cd5fbc0269dd293c42314041423ce1032a7
-EBUILD broadcom-sta-6.30.223.30.ebuild 2793 SHA256 5ff942eef90c01a1729a491a6ab09f4e627c18bc4a63958e89e5a4adf8126411 SHA512 63e540fb2a82313af185a3964a3d1d211c9c6a5f2a96af8b89251843f04f9c4d6710013397428194a56889688214e4c8a2f1330abd8718c941e5dffe75271aef WHIRLPOOL c167bbac867a84fb7fbd2545fd9ece1a8b50fe85d769da4f17ab64329ba05c9431b33699757ab65fee049245c9ac3a61fdd904d56d3c4893377f42009489d8e2
-MISC ChangeLog 12577 SHA256 40cd740216d8619e5d1c0d17eed9251231adfd8c1a8bbce8cc6386691f4233e3 SHA512 3acf3389a7cb219af0d208f21500eba7d4e5963692ba519ca663a7e272f20dd43440f316147643e500d1029208dfaa7939f1f59a95cb6c8d6ee0858e7313f531 WHIRLPOOL 241cbdc223e2bfd1dabf1a3d744d132f35ef9bc367050d6218a777c015663ee71815c625a848811e380f9fb462fd36d04a6ea7d29adbae5d7ac8d030b3455acd
+EBUILD broadcom-sta-6.30.223.30-r2.ebuild 3189 SHA256 cd6ca47eeed6efa523b3a1e8b4e3b26bee16a6c42a4464ae6cf5291bdf707326 SHA512 1bf1a624b7ad5efed2c9bcff444d3bb13e1279f3e3b8e5248ed77eccec1e6a545528d229ad9a37607ae626c103f717a7fe9d1c03fe99ea895e9900c70a1a7dd8 WHIRLPOOL 7e2c64973f1b1abb9b5571c6713b315a8b244c7fa980dedfb280830e283a2764846af4854edd06f652f1fab1f56d570cc6a37de582b2295e8e86c8ced848a4ba
+MISC ChangeLog 12993 SHA256 814e3eb8df10d04f2796914d8750a96ab7ea46bc8b242d321051407bba701a4c SHA512 051c0d246a0f116f599dda053c68c419dcd6cd1f25bf8f280849a3edac776a495a67724caedb18134d457680e3f91afa2defc94aacf9f8d6be9039f46fd70fc6 WHIRLPOOL 359913c169dd2b8b19cbfd835cdb1bd6051bc7281ca1832ed96f28edf3ec04b473190a436ad71e7e8b4c3448a09dbcd4050a0a32b9e855730722dfdb456cf488
 MISC metadata.xml 231 SHA256 1be6a1cf2be181172bfc3474a5815af1d8bca1e0c3b549be12b2cc6acaa7a665 SHA512 6ce376c5f35f2025d1b06b9ed0394f15011918553f5c4d46257998db2bfda39ec837d84527fdd9315c43c3dc16d2c5b9f78fdf27da4e024965a84441ab24fedc WHIRLPOOL 932d4cbd0f64b2cf8b2932576069e47149ae20a54024bb9ebfbb9ad8026413859a8299b102927fae3b708a02a98ef3d89ca1d9c09b1c840f348c85d782cd9b6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRj3ReAAoJECo/aRed9267e74H/RrcKtXxgnJS42kmTQMA18tA
-j/JuVIhZhDulEDWgqdr5MRxEQaHfEgxxO3NRCDN8s6/Pb/bgKfaW/ydxYaj/7OXQ
-P8VcgyCIFGLumJpeSWE3BKWVGiXSuPXsGgH2I5jmN+b5ASG63icODEW/jAzQGZjn
-lULbuddMZFOa/QRHU1UJQ3U0sNiFopLnda4r6fkceQmUyvW2bqzWuN5BXQnJVmSs
-uxrR0+fDioDE1JwIOqhEOGXl9Hjd0rkhgbpzPXl0C11EqraOFEDuHA6J5rUHRnqN
-LPd6u5QD7mBxT0ZBhanZ9uijLJKpjxGzJsjX16Uizzhqyzlkhh1VnskvVRJnRAo=
-=2PdO
+iQEcBAEBCAAGBQJSF1WoAAoJECo/aRed92673NQH/2bduUcfRhOK+kIWMONwQf18
+rigA+ahA/aCc3KlneANgZjfvEq9Ounv26ATH2dO/JU7UvDOt1gJ1f5HbPv89NwnO
+priUbwdg+B+1nRXdrsKB54ccDA8/IFqt7poknTuenO+4jn9np8/iCNUDByBvYAgg
+4LvgfLga/L/pQ2B7AfAiT+IeC+DN2tb+VLBWNeJbMIAi+Z8vN/UInCb264MPUsXT
+60JaQY+LtBQpydeeQSC55wdj6AfKW9owhVXPfuf4yNoVrYmMT8I7Z/mdki7EkYxS
+lry7MdFAR5Cru1cT1HfjIDw1aLURLvxLSiYU8vJ7mlSDSYglADnTxeO1G9Ym6Wc=
+=bzfj
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild
index 6c1e0683437e..4965eb540bed 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r1.ebuild,v 1.2 2013/05/12 10:45:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30-r2.ebuild,v 1.1 2013/08/23 12:31:04 pinkbyte Exp $
 
 EAPI="5"
 inherit eutils linux-info linux-mod unpacker
@@ -72,8 +72,10 @@ src_prepare() {
 	EPATCH_FORCE="yes" EPATCH_EXCLUDE="0002* 0004* 0005*" EPATCH_SOURCE="${S}/patches" EPATCH_SUFFIX=patch epatch
 #	Makefile.patch: keep `emake install` working
 #	linux-3.9.0.patch: add support for kernel 3.9.0
+#	linux-3.10.0.patch: add support for kernel 3.10, bug #477372
 	epatch "${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${P}-linux-3.9.0.patch"
+		"${FILESDIR}/${P}-linux-3.9.0.patch" \
+		"${FILESDIR}/${P}-linux-3.10.0.patch"
 	mv "${S}/lib/wlc_hybrid.o_shipped_"* "${S}/lib/wlc_hybrid.o_shipped" \
 		|| die "Where is the blob?"
 
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30.ebuild
deleted file mode 100644
index 1ccc7f1a0dda..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.30.ebuild,v 1.1 2013/05/01 07:22:47 pinkbyte Exp $
-
-EAPI="5"
-inherit eutils linux-mod unpacker
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="https://launchpad.net/ubuntu/+source/bcmwl http://www.broadcom.com/support/802.11/linux_sta.php"
-BASE_URI="https://launchpad.net/~albertomilone/+archive/broadcom/+files"
-BASE_NAME="bcmwl-kernel-source_${PV}%2Bbdcom-0ubuntu1%7Eppa1_"
-SRC_URI="amd64? ( ${BASE_URI}/${BASE_NAME}amd64.deb )
-		x86? ( ${BASE_URI}/${BASE_NAME}i386.deb )"
-
-LICENSE="Broadcom"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="mirror"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-#S="${WORKDIR}"
-S="${WORKDIR}/usr/src/bcmwl-${PV}+bdcom"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!SSB"
-	if kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!MAC80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
-	elif kernel_is ge 3 8 0; then
-		ewarn "Due to licensing issues this driver is unusable with kernel 3.8."
-		ewarn "Meaning: This build will likely not succeed."
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_unpack() {
-	local arch_suffix
-	if use amd64; then
-		arch_suffix="amd64"
-	else
-		arch_suffix="i386"
-	fi
-	unpack_deb "${BASE_NAME}${arch_suffix}.deb"
-}
-
-src_prepare() {
-	einfo
-	einfo "These patches come from some mighty proficient Debian programmer"
-	einfo "whose work I shamelessly exploit for Gentoo's benefit."
-	einfo "This ebuild was tested with 3.7.10-gentoo-r1."
-	einfo "If one of them patches fails against other versions, please"
-	einfo "file a bug about it at https://bugs.gentoo.org"
-	einfo
-#	Filter the outdated patches here
-#	This needs more testing against multiple versions.
-#	So far the filtered patches seem to be cruft from older versions.
-	EPATCH_FORCE="yes" EPATCH_EXCLUDE="0002* 0004* 0005*" EPATCH_SOURCE="${S}/patches" EPATCH_SUFFIX=patch epatch
-#	keep `emake install` working
-	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	mv "${S}/lib/wlc_hybrid.o_shipped_"* "${S}/lib/wlc_hybrid.o_shipped" \
-		|| die "Where is the blob?"
-
-	epatch_user
-}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch
new file mode 100644
index 000000000000..c575f289a26e
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.30-linux-3.10.0.patch
@@ -0,0 +1,102 @@
+diff -Naur bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c
+--- bcmwl-6.30.223.30+bdcom.orig/src/src/wl/sys/wl_linux.c	2013-04-23 12:31:31.011588881 +0200
++++ bcmwl-6.30.223.30+bdcom/src/src/wl/sys/wl_linux.c	2013-05-20 18:27:18.830187333 +0200
+@@ -3229,7 +3229,12 @@
+ wl_tkip_printstats(wl_info_t *wl, bool group_key)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++	struct seq_file sfile;
++	struct seq_file *debug_buf = &sfile;	
++#else
+ 	char debug_buf[512];
++#endif
+ 	int idx;
+ 	if (wl->tkipmodops) {
+ 		if (group_key) {
+@@ -3242,7 +3247,11 @@
+ 			wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
+ 		else
+ 			return;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++		printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
++#else
+ 		printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
++#endif
+ 	}
+ #endif 
+ }
+@@ -3401,17 +3410,24 @@
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int
+ wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
++#else
++static ssize_t 
++wl_proc_read (struct file *filp, char __user *buffer, size_t length, loff_t *data)
++#endif
+ {
+ 	wl_info_t * wl = (wl_info_t *)data;
+ 	int bcmerror, to_user;
+ 	int len;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ 	if (offset > 0) {
+ 		*eof = 1;
+ 		return 0;
+ 	}
++#endif
+ 
+ 	if (!length) {
+ 		WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
+@@ -3424,8 +3440,13 @@
+ 	return len;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int
+ wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
++#else
++static ssize_t 
++wl_proc_write (struct file *filp, const char __user *buff, size_t length, loff_t *data)
++#endif
+ {
+ 	wl_info_t * wl = (wl_info_t *)data;
+ 	int from_user = 0;
+@@ -3455,19 +3476,34 @@
+ 	return length;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++static const struct file_operations wl_fops = {
++     .owner	= THIS_MODULE,
++     .read	= wl_proc_read,
++     .write	= wl_proc_write,
++};
++#endif
++
+ static int
+ wl_reg_proc_entry(wl_info_t *wl)
+ {
+ 	char tmp[32];
+ 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ 	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
+ 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
++#else
++	if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) {
++		WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp));
++#endif
+ 		ASSERT(0);
+ 		return -1;
+ 	}
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ 	wl->proc_entry->read_proc = wl_proc_read;
+ 	wl->proc_entry->write_proc = wl_proc_write;
+ 	wl->proc_entry->data = wl;
++#endif
+ 	return 0;
+ }
+ #ifdef WLOFFLD