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

Commit b4779583 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: zram: fix data corruption issue
  Staging: Comedi: Fix a few NI module dependencies
  Staging: comedi: Add MODULE_LICENSE and similar to NI modules
  staging: brcm80211: bugfix for softmac crash on multi cpu configurations
  staging: sst: Fix for dmic capture on v2 pmic
  staging: hv: Enable sending GARP packet after live migration
parents e128c5e2 5414e557

drivers/staging/brcm80211/sys/wl_mac80211.c

+10 −2
Original line number Diff line number Diff line
@@ -263,9 +263,7 @@ ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan, 
	switch (type) {

	case NL80211_CHAN_HT20:

	case NL80211_CHAN_NO_HT:

		WL_LOCK(wl);

		err = wlc_set(wl->wlc, WLC_SET_CHANNEL, chan->hw_value);

		WL_UNLOCK(wl);

		break;

	case NL80211_CHAN_HT40MINUS:

	case NL80211_CHAN_HT40PLUS:
@@ -285,6 +283,7 @@ static int wl_ops_config(struct ieee80211_hw *hw, u32 changed) 
	int err = 0;

	int new_int;



	WL_LOCK(wl);

	if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {

		WL_NONE("%s: Setting listen interval to %d\n",

			__func__, conf->listen_interval);
@@ -341,6 +340,7 @@ static int wl_ops_config(struct ieee80211_hw *hw, u32 changed) 
	}



 config_out:

	WL_UNLOCK(wl);

	return err;

}
@@ -459,13 +459,21 @@ wl_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set) 


static void wl_ops_sw_scan_start(struct ieee80211_hw *hw)

{

	struct wl_info *wl = hw->priv;

	WL_NONE("Scan Start\n");

	WL_LOCK(wl);

	wlc_scan_start(wl->wlc);

	WL_UNLOCK(wl);

	return;

}



static void wl_ops_sw_scan_complete(struct ieee80211_hw *hw)

{

	struct wl_info *wl = hw->priv;

	WL_NONE("Scan Complete\n");

	WL_LOCK(wl);

	wlc_scan_stop(wl->wlc);

	WL_UNLOCK(wl);

	return;

}

drivers/staging/brcm80211/sys/wlc_mac80211.c

+13 −0
Original line number Diff line number Diff line
@@ -8461,3 +8461,16 @@ static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh, 


	kfree(qi);

}



/*

 * Flag 'scan in progress' to withold dynamic phy calibration

 */

void wlc_scan_start(struct wlc_info *wlc)

{

	wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, true);

}



void wlc_scan_stop(struct wlc_info *wlc)

{

	wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, false);

}

drivers/staging/brcm80211/sys/wlc_pub.h

+2 −0
Original line number Diff line number Diff line
@@ -570,6 +570,8 @@ extern void wlc_enable_mac(struct wlc_info *wlc); 
extern u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate);

extern u32 wlc_get_rspec_history(struct wlc_bsscfg *cfg);

extern u32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg);

extern void wlc_scan_start(struct wlc_info *wlc);

extern void wlc_scan_stop(struct wlc_info *wlc);



static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,

				    uint *arg)

drivers/staging/comedi/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ config COMEDI_NI_AT_AO 
config COMEDI_NI_ATMIO

	tristate "NI AT-MIO E series ISA-PNP card support"

	depends on ISAPNP && COMEDI_NI_TIO && COMEDI_NI_COMMON

	select COMEDI_8255

	default N

	---help---

	  Enable support for National Instruments AT-MIO E series cards
@@ -1040,6 +1041,8 @@ config COMEDI_NI_PCIDIO 
config COMEDI_NI_PCIMIO

	tristate "NI PCI-MIO-E series and M series support"

	depends on COMEDI_NI_TIO && COMEDI_NI_COMMON

	select COMEDI_8255

	select COMEDI_FC

	default N

	---help---

	  Enable support for National Instruments PCI-MIO-E series and M series
@@ -1164,6 +1167,7 @@ config COMEDI_NI_LABPC_CS 
config COMEDI_NI_MIO_CS

	tristate "NI DAQCard E series PCMCIA support"

	depends on COMEDI_NI_TIO && COMEDI_NI_COMMON

	select COMEDI_8255

	select COMEDI_FC

	default N

	---help---
@@ -1268,7 +1272,6 @@ config COMEDI_MITE 
config COMEDI_NI_TIO

	tristate "NI general purpose counter support"

	depends on COMEDI_MITE

	select COMEDI_8255

	default N

	---help---

	  Enable support for National Instruments general purpose counters.

drivers/staging/comedi/drivers/mite.c

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ 
#define PCI_DAQ_SIZE		4096

#define PCI_DAQ_SIZE_660X       8192



MODULE_LICENSE("GPL");



struct mite_struct *mite_devices;

EXPORT_SYMBOL(mite_devices);