diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wl_cfg80211.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.h b/drivers/net/wireless/bcmdhd/wl_cfg80211.h index 2b8e66413f2..6e43c3f3b31 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.h +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.h @@ -1,9 +1,9 @@ /* * Linux cfg80211 driver * - * Copyright (C) 1999-2011, Broadcom Corporation + * Copyright (C) 1999-2012, Broadcom Corporation * - * Unless you and Broadcom execute a separate written software license + * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the @@ -21,7 +21,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: wl_cfg80211.h,v 1.1.4.1.2.8 2011/02/09 01:37:52 Exp $ + * $Id: wl_cfg80211.h 307885 2012-01-12 23:30:48Z $ */ #ifndef _wl_cfg80211_h_ @@ -423,7 +423,7 @@ struct wl_priv { bool pwr_save; bool roam_on; /* on/off switch for self-roaming */ bool scan_tried; /* indicates if first scan attempted */ - u8 *ioctl_buf; /* ioctl buffer */ + u8 *ioctl_buf; /* ioctl buffer */ struct mutex ioctl_buf_sync; u8 *escan_ioctl_buf; u8 *extra_buf; /* maily to grab assoc information */ @@ -444,12 +444,12 @@ struct wl_priv { struct timer_list scan_timeout; /* Timer for catch scan event timeout */ }; + static inline struct wl_bss_info *next_bss(struct wl_scan_results *list, struct wl_bss_info *bss) { return bss = bss ? (struct wl_bss_info *)((uintptr) bss + dtoh32(bss->length)) : list->bss_info; } - static inline s32 wl_alloc_netinfo(struct wl_priv *wl, struct net_device *ndev, struct wireless_dev * wdev, s32 mode) @@ -470,7 +470,6 @@ wl_alloc_netinfo(struct wl_priv *wl, struct net_device *ndev, } return err; } - static inline void wl_dealloc_netinfo(struct wl_priv *wl, struct net_device *ndev) { @@ -487,8 +486,8 @@ wl_dealloc_netinfo(struct wl_priv *wl, struct net_device *ndev) kfree(_net_info); } } -} +} static inline void wl_delete_all_netinfo(struct wl_priv *wl) { @@ -502,7 +501,6 @@ wl_delete_all_netinfo(struct wl_priv *wl) } wl->iface_cnt = 0; } - static inline bool wl_get_status_all(struct wl_priv *wl, s32 status) @@ -516,7 +514,6 @@ wl_get_status_all(struct wl_priv *wl, s32 status) } return cnt? true: false; } - static inline void wl_set_status_by_netdev(struct wl_priv *wl, s32 status, struct net_device *ndev, u32 op) @@ -540,6 +537,7 @@ wl_set_status_by_netdev(struct wl_priv *wl, s32 status, } } + } static inline u32 @@ -567,6 +565,7 @@ wl_get_mode_by_netdev(struct wl_priv *wl, struct net_device *ndev) return -1; } + static inline void wl_set_mode_by_netdev(struct wl_priv *wl, struct net_device *ndev, s32 mode) @@ -578,7 +577,6 @@ wl_set_mode_by_netdev(struct wl_priv *wl, struct net_device *ndev, _net_info->mode = mode; } } - static inline struct wl_profile * wl_get_profile_by_netdev(struct wl_priv *wl, struct net_device *ndev) { @@ -635,8 +633,7 @@ struct device *wl_cfg80211_get_parent_dev(void); extern s32 wl_cfg80211_up(void *para); extern s32 wl_cfg80211_down(void *para); -extern s32 wl_cfg80211_notify_ifadd(struct net_device *ndev, s32 idx, s32 bssidx, - void* _net_attach); +extern s32 wl_cfg80211_notify_ifadd(struct net_device *net, s32 idx, s32 bssidx, void* _net_attach); extern s32 wl_cfg80211_ifdel_ops(struct net_device *net); extern s32 wl_cfg80211_notify_ifdel(struct net_device *ndev); extern s32 wl_cfg80211_is_progress_ifadd(void); @@ -652,8 +649,6 @@ extern s32 wl_cfg80211_set_wps_p2p_ie(struct net_device *net, char *buf, int len extern s32 wl_cfg80211_set_p2p_ps(struct net_device *net, char* buf, int len); extern int wl_cfg80211_hang(struct net_device *dev, u16 reason); extern s32 wl_mode_to_nl80211_iftype(s32 mode); -int wl_cfg80211_do_driver_init(struct net_device *net); -void wl_cfg80211_enable_trace(int level); /* do scan abort */ extern s32 wl_cfg80211_scan_abort(struct wl_priv *wl, struct net_device *ndev); |