From f68d8031e4a087f92c2842655d461daf99ed78ff Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 11 Nov 2009 17:23:31 +0100 Subject: [PATCH] --- yaml --- r: 171747 b: refs/heads/master c: c258d2de972d1e391a3dec731e0801ed1cc85494 h: refs/heads/master i: 171745: 2e3109acc8b2b076cc65f7e3bd4ac92bfca89868 171743: 9e484f854bce6dcbd2ad0a592f34741ed9484a4f v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15ab6b3aede1..18a56e07095a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f501dba4c4c5bda1b64c941997ab7ece1d503945 +refs/heads/master: c258d2de972d1e391a3dec731e0801ed1cc85494 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 5c8b3bfada4b..37264d56bace 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -1821,7 +1821,7 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info) } /* - * Get vlan interface making sure it is on the right wiphy. + * Get vlan interface making sure it is running and on the right wiphy. */ static int get_vlan(struct genl_info *info, struct cfg80211_registered_device *rdev, @@ -1839,6 +1839,8 @@ static int get_vlan(struct genl_info *info, return -EINVAL; if ((*vlan)->ieee80211_ptr->wiphy != &rdev->wiphy) return -EINVAL; + if (!netif_running(*vlan)) + return -ENETDOWN; } return 0; }