rpms/wl-kmod/F-20 wl-kmod-006_kernel_3.16.patch, NONE, 1.1 wl-kmod-007_kernel_3.17.patch, NONE, 1.1 wl-kmod-005_kernel_3.16.patch, 1.1, NONE wl-kmod-006_kernel_3.17.patch, 1.1, NONE wl-kmod-007_kernel_3.18.patch, 1.1, NONE wl-kmod-008_kernel_3.18_null_pointer.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9793/F-20

Added Files:
	wl-kmod-006_kernel_3.16.patch wl-kmod-007_kernel_3.17.patch 
Removed Files:
	wl-kmod-005_kernel_3.16.patch wl-kmod-006_kernel_3.17.patch 
	wl-kmod-007_kernel_3.18.patch 
	wl-kmod-008_kernel_3.18_null_pointer.patch 
Log Message:
CVS update


wl-kmod-006_kernel_3.16.patch:
 wl_cfg80211_hybrid.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

--- NEW FILE wl-kmod-006_kernel_3.16.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c	2014-07-15 21:28:47.002546122 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c	2014-09-10 19:27:13.301316520 +0200
@@ -63,8 +63,13 @@
 static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
            struct cfg80211_ibss_params *params);
 static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
+           struct net_device *dev, const u8 *mac, struct station_info *sinfo);
+#else
 static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
            struct net_device *dev, u8 *mac, struct station_info *sinfo);
+#endif
 static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
            struct net_device *dev, bool enabled, s32 timeout);
 static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
@@ -1387,7 +1392,11 @@
 	key_endian_to_host(&key);
 
 	params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+	memcpy((void *)params.key, key.data, params.key_len);
+#else
 	memcpy(params.key, key.data, params.key_len);
+#endif
 
 	if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) {
 		return err;
@@ -1421,9 +1430,15 @@
 	return err;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
+static s32
+wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+                        const u8 *mac, struct station_info *sinfo)
+#else
 static s32
 wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                         u8 *mac, struct station_info *sinfo)
+#endif
 {
 	struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy);
 	scb_val_t scb_val;

wl-kmod-007_kernel_3.17.patch:
 wl_linux.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE wl-kmod-007_kernel_3.17.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c	2014-07-15 17:27:12.550312000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c	2014-10-03 22:02:07.746840461 +0200
@@ -1313,7 +1313,12 @@
 	dev->priv = priv_link;
 #else
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+#else
+	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, 
+		ether_setup);
+#endif 
 	if (!dev) {
 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));


--- wl-kmod-005_kernel_3.16.patch DELETED ---


--- wl-kmod-006_kernel_3.17.patch DELETED ---


--- wl-kmod-007_kernel_3.18.patch DELETED ---


--- wl-kmod-008_kernel_3.18_null_pointer.patch DELETED ---