linux-recent.patch

diff -ur src_orig/src/wl/sys/wl_cfg80211_hybrid.c src/src/wl/sys/wl_cfg80211_hybrid.c
--- src_orig/src/wl/sys/wl_cfg80211_hybrid.c    2014-08-05 17:50:28.578560455 -0300
+++ src/src/wl/sys/wl_cfg80211_hybrid.c 2014-08-05 17:48:57.508426883 -0300
@@ -2071,7 +2071,26 @@
            wl_get_assoc_ies(wl);
            memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
            wl_update_bss_info(wl);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
+           {
+               struct wl_bss_info *bi;
+               u16 bss_info_channel;
+               struct ieee80211_channel *channel;
+               u32 freq;
+
+               bi = (struct wl_bss_info *)(wl->extra_buf + 4);
+               bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
+
+               freq = ieee80211_channel_to_frequency(bss_info_channel,
+                      (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
+                      IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+
+               channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
+               cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+           }
+#else
            cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
            set_bit(WL_STATUS_CONNECTED, &wl->status);
            wl->profile->active = true;
        }
diff -ur src_orig/src/wl/sys/wl_linux.c src/src/wl/sys/wl_linux.c
--- src_orig/src/wl/sys/wl_linux.c  2014-08-05 17:50:28.578560455 -0300
+++ src/src/wl/sys/wl_linux.c   2014-08-05 08:31:05.112606474 -0300
@@ -879,7 +879,7 @@
 static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
 #endif

-static struct pci_driver wl_pci_driver = {
+static struct pci_driver wl_pci_driver __refdata = {
    .name =     "wl",
    .probe =    wl_pci_probe,
    .remove =   __devexit_p(wl_remove),
Only in src_orig/src/wl/sys: wl_linux.c.orig