Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1109736 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents bb3bb3a5 b48d9665

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −2
Original line number Diff line number Diff line
@@ -3405,7 +3405,7 @@ il4965_remove_dynamic_key(struct il_priv *il, 
		return 0;

	}



	if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) {

	if (il->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_INVALID) {

		IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx,

			key_flags);

		spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -3420,7 +3420,7 @@ il4965_remove_dynamic_key(struct il_priv *il, 
	memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));

	il->stations[sta_id].sta.key.key_flags =

	    STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;

	il->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;

	il->stations[sta_id].sta.key.key_offset = keyconf->hw_key_idx;

	il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;

	il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;

drivers/net/wireless/iwlegacy/common.c

+6 −8
Original line number Diff line number Diff line
@@ -4767,7 +4767,6 @@ il_bg_watchdog(unsigned long data) 
		return;



	/* monitor and check for other stuck queues */

	if (il_is_any_associated(il)) {

	for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {

		/* skip as we already checked the command queue */

		if (cnt == il->cmd_queue)
@@ -4775,7 +4774,6 @@ il_bg_watchdog(unsigned long data) 
		if (il_check_stuck_queue(il, cnt))

			return;

	}

	}



	mod_timer(&il->watchdog,

		  jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));

drivers/net/wireless/mwifiex/cfg80211.c

+1 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 
	case NL80211_HIDDEN_SSID_ZERO_CONTENTS:

		/* firmware doesn't support this type of hidden SSID */

	default:

		kfree(bss_cfg);

		return -EINVAL;

	}

drivers/net/wireless/rt2x00/rt2x00usb.c

+1 −1
Original line number Diff line number Diff line
@@ -436,8 +436,8 @@ void rt2x00usb_kick_queue(struct data_queue *queue) 
	case QID_RX:

		if (!rt2x00queue_full(queue))

			rt2x00queue_for_each_entry(queue,

						   Q_INDEX_DONE,

						   Q_INDEX,

						   Q_INDEX_DONE,

						   NULL,

						   rt2x00usb_kick_rx_entry);

		break;

net/mac80211/mlme.c

+2 −4
Original line number Diff line number Diff line
@@ -2174,15 +2174,13 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
		       sdata->name, mgmt->sa, status_code);

		ieee80211_destroy_assoc_data(sdata, false);

	} else {

		printk(KERN_DEBUG "%s: associated\n", sdata->name);



		if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {

			/* oops -- internal error -- send timeout for now */

			ieee80211_destroy_assoc_data(sdata, true);

			sta_info_destroy_addr(sdata, mgmt->bssid);

			ieee80211_destroy_assoc_data(sdata, false);

			cfg80211_put_bss(*bss);

			return RX_MGMT_CFG80211_ASSOC_TIMEOUT;

		}

		printk(KERN_DEBUG "%s: associated\n", sdata->name);



		/*

		 * destroy assoc_data afterwards, as otherwise an idle