Revision 11261,
2.2 KB
checked in by ara_t, 7 years ago
(diff) |
update: self-build-broadcom-wl
|
-
old
|
new
|
u32 wl_dbg_level = WL_DBG_ERR; |
53 | 53 | #endif |
54 | 54 | |
55 | 55 | static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, |
56 | | enum nl80211_iftype type, u32 *flags, struct vif_params *params); |
| 56 | enum nl80211_iftype type, |
| 57 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) |
| 58 | u32 *flags, |
| 59 | #endif |
| 60 | struct vif_params *params); |
57 | 61 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) |
58 | 62 | static s32 |
59 | 63 | wl_cfg80211_scan(struct wiphy *wiphy, |
… |
… |
wl_dev_ioctl(struct net_device *dev, u32 |
466 | 470 | |
467 | 471 | static s32 |
468 | 472 | wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, |
469 | | enum nl80211_iftype type, u32 *flags, |
470 | | struct vif_params *params) |
| 473 | enum nl80211_iftype type, |
| 474 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) |
| 475 | u32 *flags, |
| 476 | #endif |
| 477 | struct vif_params *params) |
471 | 478 | { |
472 | 479 | struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); |
473 | 480 | struct wireless_dev *wdev; |
… |
… |
wl_bss_roaming_done(struct wl_cfg80211_p |
2387 | 2394 | const wl_event_msg_t *e, void *data) |
2388 | 2395 | { |
2389 | 2396 | struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); |
| 2397 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) |
| 2398 | struct cfg80211_roam_info roam_info = { |
| 2399 | .bssid = wl->profile->bssid, |
| 2400 | .req_ie = conn_info->req_ie, |
| 2401 | .req_ie_len = conn_info->req_ie_len, |
| 2402 | .resp_ie = conn_info->resp_ie, |
| 2403 | .resp_ie_len = conn_info->resp_ie_len, |
| 2404 | }; |
| 2405 | #endif |
2390 | 2406 | s32 err = 0; |
2391 | 2407 | |
2392 | 2408 | err = wl_get_assoc_ies(wl); |
… |
… |
wl_bss_roaming_done(struct wl_cfg80211_p |
2401 | 2417 | return err; |
2402 | 2418 | |
2403 | 2419 | cfg80211_roamed(ndev, |
| 2420 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) |
| 2421 | &roam_info, |
| 2422 | #else |
2404 | 2423 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) |
2405 | 2424 | &wl->conf->channel, |
2406 | 2425 | #endif |
2407 | 2426 | (u8 *)&wl->bssid, |
2408 | 2427 | conn_info->req_ie, conn_info->req_ie_len, |
2409 | | conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); |
| 2428 | conn_info->resp_ie, conn_info->resp_ie_len, |
| 2429 | #endif |
| 2430 | GFP_KERNEL); |
2410 | 2431 | WL_DBG(("Report roaming result\n")); |
2411 | 2432 | |
2412 | 2433 | set_bit(WL_STATUS_CONNECTED, &wl->status); |
Note: See
TracBrowser
for help on using the repository browser.