Explorar el Código

mac80211: make active monitor injection work w/ HW queue

When a driver (like hwsim) uses HW queue control an
active monitor vif needs to be used for the queues,
make the code do that. Otherwise we'd bail out and
drop the frames.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Johannes Berg hace 12 años
padre
commit
c82b5a74cc
Se han modificado 1 ficheros con 4 adiciones y 0 borrados
  1. 4 0
      net/mac80211/tx.c

+ 4 - 0
net/mac80211/tx.c

@@ -1272,6 +1272,10 @@ static bool __ieee80211_tx(struct ieee80211_local *local,
 
 
 	switch (sdata->vif.type) {
 	switch (sdata->vif.type) {
 	case NL80211_IFTYPE_MONITOR:
 	case NL80211_IFTYPE_MONITOR:
+		if (sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE) {
+			vif = &sdata->vif;
+			break;
+		}
 		sdata = rcu_dereference(local->monitor_sdata);
 		sdata = rcu_dereference(local->monitor_sdata);
 		if (sdata) {
 		if (sdata) {
 			vif = &sdata->vif;
 			vif = &sdata->vif;