iwlwifi: only check for association id when associating with AP
There is no association process in IBSS mode - so testing the association id is not needed. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> CC: Richard Scherping <richard@scherping.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
58ff6d4db9
Коммит
a6477249b4
|
@ -2812,7 +2812,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* drop all data frame if we are not associated */
|
/* drop all data frame if we are not associated */
|
||||||
if ((!iwl3945_is_associated(priv) || !priv->assoc_id) &&
|
if ((!iwl3945_is_associated(priv) ||
|
||||||
|
((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id)) &&
|
||||||
((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
|
((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
|
||||||
IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n");
|
IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n");
|
||||||
goto drop_unlock;
|
goto drop_unlock;
|
||||||
|
|
|
@ -2940,7 +2940,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
|
||||||
/* drop all data frame if we are not associated */
|
/* drop all data frame if we are not associated */
|
||||||
if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
|
if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
|
||||||
(!iwl4965_is_associated(priv) ||
|
(!iwl4965_is_associated(priv) ||
|
||||||
!priv->assoc_id ||
|
((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id) ||
|
||||||
!priv->assoc_station_added)) {
|
!priv->assoc_station_added)) {
|
||||||
IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");
|
IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");
|
||||||
goto drop_unlock;
|
goto drop_unlock;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче