Revision 9688,
1.7 KB
checked in by inagaki, 9 years ago
(diff) |
2015-08-02 Ryoichi INAGAKI <ryo1@…>
- self-build-broadcom-wl: added patch for kernel 3.18
- xfce4-embed-plugin, xfce4-verve-plugin, xfdesktop: updated
|
-
old
|
new
|
|
1307 | 1307 | dev->priv = priv_link; |
1308 | 1308 | #else |
1309 | 1309 | |
| 1310 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) |
1310 | 1311 | dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); |
| 1312 | #else |
| 1313 | dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ether_setup); |
| 1314 | #endif |
1311 | 1315 | if (!dev) { |
1312 | 1316 | WL_ERROR(("wl%d: %s: alloc_netdev failed\n", |
1313 | 1317 | (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); |
-
old
|
new
|
|
2010 | 2010 | |
2011 | 2011 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); |
2012 | 2012 | notify_ielen = le32_to_cpu(bi->ie_length); |
| 2013 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)) |
2013 | 2014 | cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), |
2014 | 2015 | 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, |
2015 | 2016 | (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); |
| 2017 | #else |
| 2018 | cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), |
| 2019 | 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, |
| 2020 | (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); |
| 2021 | #endif |
2016 | 2022 | |
2017 | 2023 | if (unlikely(!cbss)) |
2018 | 2024 | return -ENOMEM; |
… |
… |
|
2071 | 2077 | wl_get_assoc_ies(wl); |
2072 | 2078 | memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); |
2073 | 2079 | wl_update_bss_info(wl); |
| 2080 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) |
2074 | 2081 | cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); |
| 2082 | #else |
| 2083 | cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, |
| 2084 | &wl->conf->channel, GFP_KERNEL); |
| 2085 | #endif |
2075 | 2086 | set_bit(WL_STATUS_CONNECTED, &wl->status); |
2076 | 2087 | wl->profile->active = true; |
2077 | 2088 | } |
Note: See
TracBrowser
for help on using the repository browser.