| Message ID | 1382819655-30430-14-git-send-email-pali.rohar@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat 2013-10-26 22:34:12, Pali Rohár wrote: > From: David Gnedt <david.gnedt@davizone.at> > > The firmware doesn't support per packet encryption selection, so disable hw > encryption support completly while a monitor interface is present to support "completely". > injection of packets (which shouldn't get encrypted by hw). > To enforce the changed hw encryption support force a disassociation on > non-monitor interfaces. > For disassociation a workaround using hw connection monitor is employed, > which temporary enables hw connection manager flag. > > Signed-off-by: David Gnedt <david.gnedt@davizone.at> Missing sign-off. > index 174f403..f054741 100644 > --- a/drivers/net/wireless/ti/wl1251/main.c > +++ b/drivers/net/wireless/ti/wl1251/main.c > @@ -685,6 +685,16 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) > wl->power_level = conf->power_level; > } > > + /* > + * Tell stack that connection is lost because hw encryption isn't > + * supported in monitor mode. > + * XXX This requires temporary enabling the hw connection monitor flag > + */ "of the" and I guess you can remove the XXX? This way it looks like workaround is not complete. Thanks, Pavel
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 174f403..f054741 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c @@ -685,6 +685,16 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) wl->power_level = conf->power_level; } + /* + * Tell stack that connection is lost because hw encryption isn't + * supported in monitor mode. + * XXX This requires temporary enabling the hw connection monitor flag + */ + if ((changed & IEEE80211_CONF_CHANGE_MONITOR) && wl->vif) { + wl->hw->flags |= IEEE80211_HW_CONNECTION_MONITOR; + ieee80211_connection_loss(wl->vif); + } + out_sleep: wl1251_ps_elp_sleep(wl); @@ -1116,6 +1126,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, } if (changed & BSS_CHANGED_ASSOC) { + /* XXX Disable temporary enabled hw connection monitor flag */ + wl->hw->flags &= ~IEEE80211_HW_CONNECTION_MONITOR; + if (bss_conf->assoc) { wl->beacon_int = bss_conf->beacon_int;