| Message ID | 20160819200248.8202-1-linus.luessing@c0d3.blue (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
On Fri, 2016-08-19 at 22:02 +0200, Linus Lüssing wrote: > This allows modules using this function (currently: batman-adv) to > compile even if cfg80211 is not built at all, thus relaxing > dependencies. johannes
On Fri, 2016-08-19 at 22:02 +0200, Linus Lüssing wrote: > This allows modules using this function (currently: batman-adv) to > compile even if cfg80211 is not built at all, thus relaxing > dependencies. > Err, excuse the earlier empty email - editing mixup. I've applied this and will send it to 4.8 so you can take advantage of it sooner (to adjust the Kconfig dependencies, presumably). johannes
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 9c23f4d3..beb7610 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1102,6 +1102,7 @@ struct station_info { struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1]; }; +#if IS_ENABLED(CONFIG_CFG80211) /** * cfg80211_get_station - retrieve information about a given station * @dev: the device where the station is supposed to be connected to @@ -1114,6 +1115,14 @@ struct station_info { */ int cfg80211_get_station(struct net_device *dev, const u8 *mac_addr, struct station_info *sinfo); +#else +static inline int cfg80211_get_station(struct net_device *dev, + const u8 *mac_addr, + struct station_info *sinfo) +{ + return -ENOENT; +} +#endif /** * enum monitor_flags - monitor flags
This allows modules using this function (currently: batman-adv) to compile even if cfg80211 is not built at all, thus relaxing dependencies. Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> --- include/net/cfg80211.h | 9 +++++++++ 1 file changed, 9 insertions(+)