mac80211/cfg80211: add station events
Subsystems (2)
Johannes Berg
maintainerPATCH 1/1 mac80211/cfg80211: add station events
When, for instance, a new IBSS peer is found, userspace wants to be notified. Add events for all new stations that mac80211 learns about.
Signed-off-by Johannes Berg <[email protected]>
--- include/net/cfg80211.h | 12 ++++++++++++ net/mac80211/sta_info.c | 5 +++++ net/wireless/mlme.c | 10 ++++++++++ net/wireless/nl80211.c | 21 ++++++++++++++++++++- net/wireless/nl80211.h | 4 ++++ 5 files changed, 51 insertions(+), 1 deletion(-)
net/wireless/mlme.c +10 -0
@@ -707,3 +707,13 @@ void cfg80211_remain_on_channel_expired( channel_type, gfp); }EXPORT_SYMBOL (cfg80211_remain_on_channel_expired); + +void cfg80211_new_sta (struct net_device *dev,const u8 *mac_addr, +struct station_info *sinfo,gfp_t gfp) +{ +struct wiphy *wiphy = dev->ieee80211_ptr->wiphy; +struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); + +nl80211_send_sta_event (rdev, dev, mac_addr, sinfo, gfp); +} +EXPORT_SYMBOL (cfg80211_new_sta);
net/wireless/nl80211.c +20 -1
@@ -1675,7 +1675,7 @@ static u16 nl80211_calculate_bitrate(strstatic int nl80211_send_station (struct sk_buff *msg,u32 pid,u32 seq,int flags,struct net_device *dev, -u8 *mac_addr,struct station_info *sinfo) +const u8 *mac_addr,struct station_info *sinfo) {void *hdr;struct nlattr *sinfoattr, *txrate;
@@ -5389,6 +5389,25 @@ void nl80211_send_remain_on_channel_canc channel_type, 0, gfp); } +void nl80211_send_sta_event (struct cfg80211_registered_device *rdev, +struct net_device *dev,const u8 *mac_addr, +struct station_info *sinfo,gfp_t gfp) +{ +struct sk_buff *msg; + + msg =nlmsg_new (NLMSG_GOODSIZE , gfp); +if (!msg) +return ; + +if (nl80211_send_station (msg,0 ,0 ,0 , dev, mac_addr, sinfo) <0 ) { +nlmsg_free (msg); +return ; + } + +genlmsg_multicast_netns (wiphy_net (&rdev->wiphy), msg,0 , + nl80211_mlme_mcgrp.id, gfp); +} +/* initialisation/exit functions */ int nl80211_init (void )
net/wireless/nl80211.h +4 -0
@@ -70,4 +70,8 @@ void nl80211_send_remain_on_channel_canc u64 cookie, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, gfp_t gfp); +void nl80211_send_sta_event (struct cfg80211_registered_device *rdev, +struct net_device *dev,const u8 *mac_addr, +struct station_info *sinfo,gfp_t gfp); +#endif /* __NET_WIRELESS_NL80211_H */
include/net/cfg80211.h +12 -0
@@ -2177,4 +2177,16 @@ void cfg80211_remain_on_channel_expired(enum nl80211_channel_type channel_type, gfp_t gfp); + +/** +* cfg80211_new_sta - notify userspace about station +* +* @dev: the netdev +* @mac_addr: the station's address +* @sinfo: the station information +* @gfp: allocation flags +*/ +void cfg80211_new_sta (struct net_device *dev,const u8 *mac_addr, +struct station_info *sinfo,gfp_t gfp); +#endif /* __NET_CFG80211_H */
net/mac80211/sta_info.c +5 -0
@@ -359,6 +359,7 @@ int sta_info_insert(struct sta_info *sta {struct ieee80211_local *local = sta->local;struct ieee80211_sub_if_data *sdata = sta->sdata; +struct station_info sinfo;unsigned long flags;int err =0 ;
@@ -408,6 +409,10 @@ int sta_info_insert(struct sta_info *staspin_unlock_irqrestore (&local->sta_lock, flags); + sinfo.filled =0 ; + sinfo.generation = local->sta_generation; +cfg80211_new_sta (sdata->dev, sta->sta.addr, &sinfo,GFP_ATOMIC ); +#ifdef CONFIG_MAC80211_DEBUGFS /* * Debugfs entry adding might sleep, so schedule process