diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
| commit | b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636 (patch) | |
| tree | 9507b9d129ea8d7598d79f4b5674865483c7f00b /net/wireless/core.h | |
| parent | 6c9888532bb540cb692f51f1d34fe9344eed5a0d (diff) | |
| parent | ad43f8bfb7b9a6a8b800cdad24c4a62180a5eb3d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index f565432ae22..2a33d8bc886 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -370,8 +370,12 @@ void cfg80211_sme_scan_done(struct net_device *dev); void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len); void cfg80211_sme_disassoc(struct net_device *dev, int idx); void __cfg80211_scan_done(struct work_struct *wk); -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev); +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak); void cfg80211_upload_connect_keys(struct wireless_dev *wdev); +int cfg80211_change_iface(struct cfg80211_registered_device *rdev, + struct net_device *dev, enum nl80211_iftype ntype, + u32 *flags, struct vif_params *params); +void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev); struct ieee80211_channel * rdev_fixed_channel(struct cfg80211_registered_device *rdev, @@ -380,4 +384,15 @@ int rdev_set_freq(struct cfg80211_registered_device *rdev, struct wireless_dev *for_wdev, int freq, enum nl80211_channel_type channel_type); +#ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS +#define CFG80211_DEV_WARN_ON(cond) WARN_ON(cond) +#else +/* + * Trick to enable using it as a condition, + * and also not give a warning when it's + * not used that way. + */ +#define CFG80211_DEV_WARN_ON(cond) ({bool __r = (cond); __r; }) +#endif + #endif /* __NET_WIRELESS_CORE_H */ |