linux-4.0.0

work-folder/linux-recent.patch

@@ -99,6 +99,32 @@
 
  	wl_deinit_cfg80211_priv(wl);
  	wl_free_wdev(wl);
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:29.899350026 +0100
++++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:06.732682365 +0100
+@@ -1452,7 +1452,11 @@
+ 		WL_DBG(("Could not get rate (%d)\n", err));
+ 	} else {
+ 		rate = dtoh32(rate);
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
++		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
++		#else
+ 		sinfo->filled |= STATION_INFO_TX_BITRATE;
++		#endif
+ 		sinfo->txrate.legacy = rate * 5;
+ 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
+ 	}
+@@ -1465,7 +1469,11 @@
+ 			return err;
+ 		}
+ 		rssi = dtoh32(scb_val.val);
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
++		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
++		#else
+ 		sinfo->filled |= STATION_INFO_SIGNAL;
++		#endif
+ 		sinfo->signal = rssi;
+ 		WL_DBG(("RSSI %d dBm\n", rssi));
+ 	}
 --- a/src/wl/sys/wl_dbg.h	2014-06-26 10:42:08.000000000 +0000
 +++ b/src/wl/sys/wl_dbg.h	2014-12-30 17:02:03.840957429 +0000
 @@ -55,10 +55,12 @@
@@ -117,7 +143,7 @@
  #define WL_APSTA_UPDN(args)
 --- a/src/wl/sys/wl_linux.c	2014-06-26 10:42:08.000000000 +0000
 +++ b/src/wl/sys/wl_linux.c	2014-12-30 17:02:03.841957446 +0000
-@@ -878,7 +878,7 @@
+@@ -878,7 +878,7 @@ wl_remove(struct pci_dev *pdev)
  static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
  #endif
 
@@ -126,15 +152,15 @@
  	.name =		"wl",
  	.probe =	wl_pci_probe,
  	.remove =	__devexit_p(wl_remove),
-@@ -1270,6 +1270,7 @@
+@@ -1270,6 +1270,7 @@ wl_free_if(wl_info_t *wl, wl_if_t *wlif)
  		MFREE(wl->osh, wlif->dev, sizeof(struct net_device));
  #else
  		free_netdev(wlif->dev);
 +		wlif->dev = NULL;
  #endif 
  	}
 
-@@ -1307,7 +1308,12 @@
+@@ -1307,7 +1308,12 @@ wl_alloc_linux_if(wl_if_t *wlif)
  	dev->priv = priv_link;
  #else
 
@@ -147,7 +173,7 @@
  	if (!dev) {
  		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
  			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
-@@ -1651,11 +1657,7 @@
+@@ -1651,11 +1657,7 @@ wl_ioctl(struct net_device *dev, struct
  	}
 
  	WL_LOCK(wl);
@@ -160,7 +186,17 @@
  	WL_UNLOCK(wl);
 
  done1:
-@@ -2455,8 +2457,10 @@
+@@ -2157,8 +2159,8 @@ wl_start(struct sk_buff *skb, struct net
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+
+ 		TXQ_LOCK(wl);
+
+@@ -2455,8 +2457,10 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rx
  		p80211msg_t *phdr;
 
  		len = sizeof(p80211msg_t) + oskb->len - D11_PHY_HDR_LEN;
@@ -172,7 +208,7 @@
 
  		skb_put(skb, len);
  		phdr = (p80211msg_t*)skb->data;
-@@ -2535,8 +2539,10 @@
+@@ -2535,8 +2539,10 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rx
  			rtap_len = sizeof(wl_radiotap_ht_brcm_2_t);
 
  		len = rtap_len + (oskb->len - D11_PHY_HDR_LEN);
@@ -184,7 +220,7 @@
 
  		skb_put(skb, len);
 
-@@ -2664,8 +2670,10 @@
+@@ -2664,8 +2670,10 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rx
  			len += amsdu_len;
  		}
 
@@ -196,7 +232,7 @@
 
  		skb_put(skb, len);
 
-@@ -2990,7 +2998,7 @@
+@@ -2990,7 +2998,7 @@ _wl_del_monitor(wl_task_t *task)
  }
 
  void
@@ -205,7 +241,7 @@
  {
  	const char *devname;
  	wl_if_t *wlif;
-@@ -3224,42 +3232,75 @@
+@@ -3224,42 +3232,75 @@ wl_linux_watchdog(void *ctx)
  #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)
@@ -297,7 +333,7 @@
  	int from_user = 0;
  	int bcmerror;
 
-@@ -3270,7 +3311,11 @@
+@@ -3270,7 +3311,11 @@ wl_proc_write(struct file *filp, const c
  	}
  	if (copy_from_user(&from_user, buff, 1)) {
  		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
@@ -310,7 +346,7 @@
  	}
 
  	if (from_user >= 0x30)
-@@ -3280,10 +3325,15 @@
+@@ -3280,10 +3325,15 @@ wl_proc_write(struct file *filp, const c
  	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
  	WL_UNLOCK(wl);
 
@@ -327,7 +363,7 @@
  	return length;
  }
 
-@@ -3304,8 +3354,8 @@
+@@ -3304,8 +3354,8 @@ wl_reg_proc_entry(wl_info_t *wl)
  	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
  		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
  #else