|
Lines 40-48
u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_I
Link Here
|
| 40 |
|
40 |
|
| 41 |
static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, |
41 |
static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, |
| 42 |
enum nl80211_iftype type, u32 *flags, struct vif_params *params); |
42 |
enum nl80211_iftype type, u32 *flags, struct vif_params *params); |
| 43 |
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, |
43 |
static s32 __wl_cfg80211_scan(struct wiphy *wiphy, |
|
|
44 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) |
| 45 |
struct net_device *ndev, |
| 46 |
#endif |
| 44 |
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); |
47 |
struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); |
| 45 |
static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, |
48 |
static s32 wl_cfg80211_scan(struct wiphy *wiphy, |
|
|
49 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) |
| 50 |
struct net_device *ndev, |
| 51 |
#endif |
| 46 |
struct cfg80211_scan_request *request); |
52 |
struct cfg80211_scan_request *request); |
| 47 |
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); |
53 |
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); |
| 48 |
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, |
54 |
static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, |
|
Lines 496-505
wl_cfg80211_change_iface(struct wiphy *w
Link Here
|
| 496 |
} |
502 |
} |
| 497 |
|
503 |
|
| 498 |
static s32 |
504 |
static s32 |
| 499 |
__wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, |
505 |
__wl_cfg80211_scan(struct wiphy *wiphy, |
|
|
506 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) |
| 507 |
struct net_device *ndev, |
| 508 |
#endif |
| 500 |
struct cfg80211_scan_request *request, |
509 |
struct cfg80211_scan_request *request, |
| 501 |
struct cfg80211_ssid *this_ssid) |
510 |
struct cfg80211_ssid *this_ssid) |
| 502 |
{ |
511 |
{ |
|
|
512 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) |
| 513 |
struct net_device *ndev = request->wdev->netdev; |
| 514 |
#endif |
| 503 |
struct wl_priv *wl = ndev_to_wl(ndev); |
515 |
struct wl_priv *wl = ndev_to_wl(ndev); |
| 504 |
struct cfg80211_ssid *ssids; |
516 |
struct cfg80211_ssid *ssids; |
| 505 |
struct wl_scan_req *sr = wl_to_sr(wl); |
517 |
struct wl_scan_req *sr = wl_to_sr(wl); |
|
Lines 570-582
scan_out:
Link Here
|
| 570 |
} |
582 |
} |
| 571 |
|
583 |
|
| 572 |
static s32 |
584 |
static s32 |
| 573 |
wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, |
585 |
wl_cfg80211_scan(struct wiphy *wiphy, |
|
|
586 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) |
| 587 |
struct net_device *ndev, |
| 588 |
#endif |
| 574 |
struct cfg80211_scan_request *request) |
589 |
struct cfg80211_scan_request *request) |
| 575 |
{ |
590 |
{ |
| 576 |
s32 err = 0; |
591 |
s32 err = 0; |
| 577 |
|
592 |
|
| 578 |
CHECK_SYS_UP(); |
593 |
CHECK_SYS_UP(); |
|
|
594 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) |
| 579 |
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); |
595 |
err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); |
|
|
596 |
#else |
| 597 |
err = __wl_cfg80211_scan(wiphy, request, NULL); |
| 598 |
#endif |
| 580 |
if (err) { |
599 |
if (err) { |
| 581 |
WL_DBG(("scan error (%d)\n", err)); |
600 |
WL_DBG(("scan error (%d)\n", err)); |
| 582 |
return err; |
601 |
return err; |
