aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 89519aa52893..852573423e52 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7062,7 +7062,8 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
u32 seq, int flags,
struct cfg80211_registered_device *rdev,
struct net_device *dev,
- const u8 *mac_addr, struct station_info *sinfo)
+ const u8 *mac_addr, struct station_info *sinfo,
+ bool link_stats)
{
void *hdr;
struct nlattr *sinfoattr, *bss_param;
@@ -7283,7 +7284,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
goto nla_put_failure;
}
- if (sinfo->valid_links) {
+ if (link_stats && sinfo->valid_links) {
links = nla_nest_start(msg, NL80211_ATTR_MLO_LINKS);
if (!links)
goto nla_put_failure;
@@ -7574,7 +7575,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, NLM_F_MULTI,
rdev, wdev->netdev, mac_addr,
- &sinfo) < 0)
+ &sinfo, false) < 0)
goto out;
sta_idx++;
@@ -7635,7 +7636,7 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
if (nl80211_send_station(msg, NL80211_CMD_NEW_STATION,
info->snd_portid, info->snd_seq, 0,
- rdev, dev, mac_addr, &sinfo) < 0) {
+ rdev, dev, mac_addr, &sinfo, false) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
}
@@ -19680,7 +19681,7 @@ void cfg80211_new_sta(struct net_device *dev, const u8 *mac_addr,
return;
if (nl80211_send_station(msg, NL80211_CMD_NEW_STATION, 0, 0, 0,
- rdev, dev, mac_addr, sinfo) < 0) {
+ rdev, dev, mac_addr, sinfo, false) < 0) {
nlmsg_free(msg);
return;
}
@@ -19710,7 +19711,7 @@ void cfg80211_del_sta_sinfo(struct net_device *dev, const u8 *mac_addr,
}
if (nl80211_send_station(msg, NL80211_CMD_DEL_STATION, 0, 0, 0,
- rdev, dev, mac_addr, sinfo) < 0) {
+ rdev, dev, mac_addr, sinfo, false) < 0) {
nlmsg_free(msg);
return;
}
an title='2012-02-22 13:57:05 -0800'>2012-02-22completion: remove stale "to submit patches" documentationPhilip Jägenstedt1-12/+0 2012-02-22git-p4: the option to specify 'host' is -H, not -hRussell Myers1-1/+1 2012-02-21t9100: remove bogus " || test" after each test scriptletJunio C Hamano1-5/+9 2012-02-21Update draft release notes to 1.7.10Junio C Hamano1-40/+6 2012-02-21Update draft release notes to 1.7.9.2Junio C Hamano1-16/+55 2012-02-21git-svn.perl: fix a false-positive in the "already exists" testSteven Walter2-32/+44 2012-02-21git-svn.perl: perform deletions before anything elseSteven Walter1-1/+1 2012-02-21git-svn: Fix time zone in --localtimeWei-Yin Chen (陳威尹)1-7/+11 2012-02-21git-svn: un-break "git svn rebase" when log.abbrevCommit=trueÆvar Arnfjörð Bjarmason1-2/+1 2012-02-21git-svn: remove redundant porcelain option to rev-listÆvar Arnfjörð Bjarmason1-1/+1 2012-02-21completion: add --interactive option to git svn dcommitFrederic Heitzmann1-1/+1 2012-02-21completion: Allow dash as the first character for __git_ps1Christian Hammerl1-1/+1 2012-02-20Update draft release notes to 1.7.10Junio C Hamano1-24/+40 2012-02-20Update draft release notes to 1.7.9.2Junio C Hamano1-0/+3 2012-02-20configure: don't use -lintl when there is no gettext supportJohn Szakmeister1-8/+12 2012-02-19remote: fix set-branches usage and documentationPhilip Jägenstedt2-2/+2 2012-02-19gitweb: Fix 'grep' search for multiple matches in fileJakub Narebski2-1/+41 2012-02-17refresh_index: do not show unmerged path that is outside pathspecJunio C Hamano2-2/+24 2012-02-17gitweb: Fix "heads" view when there is no current branchJakub Narebski2-2/+11