commit ff311bc11a7e2da95e1e17f99b7e4951c7060547
author Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> Tue Sep 03 19:43:18 2013 +0200
committer Johannes Berg <johannes.berg@intel.com> Tue Oct 01 13:05:59 2013 +0200
tree 319f900f3d9b540ef357cf7f048faa6652eb4b65
parent 1f4ffde845861acfe2eeaf6a2a965c02eecaad08

nl80211: allow CAC only if no operation is going on

A CAC should fail if it is triggered while the interface is already
running.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ae61711..2838206 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5591,6 +5591,9 @@
 	if (err)
 		return err;
 
+	if (netif_carrier_ok(dev))
+		return -EBUSY;
+
 	if (wdev->cac_started)
 		return -EBUSY;