Commit 98b62183 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e4da8c37
...@@ -2195,4 +2195,16 @@ void cfg80211_remain_on_channel_expired(struct net_device *dev, ...@@ -2195,4 +2195,16 @@ void cfg80211_remain_on_channel_expired(struct net_device *dev,
enum nl80211_channel_type channel_type, enum nl80211_channel_type channel_type,
gfp_t gfp); 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 */ #endif /* __NET_CFG80211_H */
...@@ -359,6 +359,7 @@ int sta_info_insert(struct sta_info *sta) ...@@ -359,6 +359,7 @@ int sta_info_insert(struct sta_info *sta)
{ {
struct ieee80211_local *local = sta->local; struct ieee80211_local *local = sta->local;
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
struct station_info sinfo;
unsigned long flags; unsigned long flags;
int err = 0; int err = 0;
...@@ -408,6 +409,10 @@ int sta_info_insert(struct sta_info *sta) ...@@ -408,6 +409,10 @@ int sta_info_insert(struct sta_info *sta)
spin_unlock_irqrestore(&local->sta_lock, flags); spin_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 #ifdef CONFIG_MAC80211_DEBUGFS
/* /*
* Debugfs entry adding might sleep, so schedule process * Debugfs entry adding might sleep, so schedule process
......
...@@ -707,3 +707,13 @@ void cfg80211_remain_on_channel_expired(struct net_device *dev, ...@@ -707,3 +707,13 @@ void cfg80211_remain_on_channel_expired(struct net_device *dev,
channel_type, gfp); channel_type, gfp);
} }
EXPORT_SYMBOL(cfg80211_remain_on_channel_expired); 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);
...@@ -1642,7 +1642,7 @@ static int parse_station_flags(struct genl_info *info, ...@@ -1642,7 +1642,7 @@ static int parse_station_flags(struct genl_info *info,
static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
int flags, struct net_device *dev, int flags, struct net_device *dev,
u8 *mac_addr, struct station_info *sinfo) const u8 *mac_addr, struct station_info *sinfo)
{ {
void *hdr; void *hdr;
struct nlattr *sinfoattr, *txrate; struct nlattr *sinfoattr, *txrate;
...@@ -5350,6 +5350,25 @@ void nl80211_send_remain_on_channel_cancel( ...@@ -5350,6 +5350,25 @@ void nl80211_send_remain_on_channel_cancel(
channel_type, 0, gfp); 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 */ /* initialisation/exit functions */
int nl80211_init(void) int nl80211_init(void)
......
...@@ -70,4 +70,8 @@ void nl80211_send_remain_on_channel_cancel( ...@@ -70,4 +70,8 @@ void nl80211_send_remain_on_channel_cancel(
u64 cookie, struct ieee80211_channel *chan, u64 cookie, struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type, gfp_t gfp); 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 */ #endif /* __NET_WIRELESS_NL80211_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment