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

Commit 722a300b 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 8177a9d7 fcb37018

drivers/bluetooth/btmrvl_main.c

+4 −5
Original line number Diff line number Diff line
@@ -498,6 +498,10 @@ static int btmrvl_service_main_thread(void *data) 
		add_wait_queue(&thread->wait_q, &wait);



		set_current_state(TASK_INTERRUPTIBLE);

		if (kthread_should_stop()) {

			BT_DBG("main_thread: break from main thread");

			break;

		}



		if (adapter->wakeup_tries ||

				((!adapter->int_count) &&
@@ -513,11 +517,6 @@ static int btmrvl_service_main_thread(void *data) 


		BT_DBG("main_thread woke up");



		if (kthread_should_stop()) {

			BT_DBG("main_thread: break from main thread");

			break;

		}



		spin_lock_irqsave(&priv->driver_lock, flags);

		if (adapter->int_count) {

			adapter->int_count = 0;

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+4 −0
Original line number Diff line number Diff line
@@ -930,6 +930,10 @@ int brcmf_bus_start(struct device *dev) 
			brcmf_fws_del_interface(ifp);

			brcmf_fws_deinit(drvr);

		}

		if (drvr->iflist[0]) {

			free_netdev(ifp->ndev);

			drvr->iflist[0] = NULL;

		}

		if (p2p_ifp) {

			free_netdev(p2p_ifp->ndev);

			drvr->iflist[1] = NULL;

drivers/net/wireless/brcm80211/brcmsmac/main.c

+2 −15
Original line number Diff line number Diff line
@@ -3074,21 +3074,8 @@ static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail) 
 */

static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)

{

	/* disallow PS when one of the following global conditions meets */

	if (!wlc->pub->associated)

	/* not supporting PS so always return false for now */

	return false;



	/* disallow PS when one of these meets when not scanning */

	if (wlc->filter_flags & FIF_PROMISC_IN_BSS)

		return false;



	if (wlc->bsscfg->type == BRCMS_TYPE_AP)

		return false;



	if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC)

		return false;



	return true;

}



static void brcms_c_statsupd(struct brcms_c_info *wlc)

drivers/net/wireless/iwlegacy/3945-rs.c

+1 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, 
		rs_sta->last_txrate_idx = idx;

		info->control.rates[0].idx = rs_sta->last_txrate_idx;

	}

	info->control.rates[0].count = 1;



	D_RATE("leave: %d\n", idx);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -2268,7 +2268,7 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, 
		info->control.rates[0].flags = 0;

	}

	info->control.rates[0].idx = rate_idx;



	info->control.rates[0].count = 1;

}



static void *