[9688] | 1 | --- src/wl/sys/wl_linux.c.orig 2014-06-26 03:42:08.000000000 -0700 |
---|
| 2 | +++ src/wl/sys/wl_linux.c 2015-07-29 06:37:51.000000000 -0700 |
---|
| 3 | @@ -1307,7 +1307,11 @@ |
---|
| 4 | dev->priv = priv_link; |
---|
| 5 | #else |
---|
| 6 | |
---|
| 7 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) |
---|
| 8 | dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); |
---|
| 9 | +#else |
---|
| 10 | + dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup); |
---|
| 11 | +#endif |
---|
| 12 | if (!dev) { |
---|
| 13 | WL_ERROR(("wl%d: %s: alloc_netdev failed\n", |
---|
| 14 | (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); |
---|
| 15 | --- src/wl/sys/wl_cfg80211_hybrid.c.orig 2014-06-26 03:42:08.000000000 -0700 |
---|
| 16 | +++ src/wl/sys/wl_cfg80211_hybrid.c 2015-07-29 07:03:39.000000000 -0700 |
---|
| 17 | @@ -2010,9 +2010,15 @@ |
---|
| 18 | |
---|
| 19 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); |
---|
| 20 | notify_ielen = le32_to_cpu(bi->ie_length); |
---|
| 21 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)) |
---|
| 22 | cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), |
---|
| 23 | 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, |
---|
| 24 | (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); |
---|
| 25 | +#else |
---|
| 26 | + cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), |
---|
| 27 | + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, |
---|
| 28 | + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); |
---|
| 29 | +#endif |
---|
| 30 | |
---|
| 31 | if (unlikely(!cbss)) |
---|
| 32 | return -ENOMEM; |
---|
| 33 | @@ -2071,7 +2077,12 @@ |
---|
| 34 | wl_get_assoc_ies(wl); |
---|
| 35 | memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); |
---|
| 36 | wl_update_bss_info(wl); |
---|
| 37 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) |
---|
| 38 | cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); |
---|
| 39 | +#else |
---|
| 40 | + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, |
---|
| 41 | + &wl->conf->channel, GFP_KERNEL); |
---|
| 42 | +#endif |
---|
| 43 | set_bit(WL_STATUS_CONNECTED, &wl->status); |
---|
| 44 | wl->profile->active = true; |
---|
| 45 | } |
---|