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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 

Conflicts:
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
parents c43933e6 f09a8785

drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -519,7 +519,7 @@ static const u32 ar9580_1p0_mac_core[][2] = { 
	{0x00008258, 0x00000000},

	{0x00008258, 0x00000000},

	{0x0000825c, 0x40000000},

	{0x0000825c, 0x40000000},

	{0x00008260, 0x00080922},

	{0x00008260, 0x00080922},

	{0x00008264, 0x9bc00010},

	{0x00008264, 0x9d400010},

	{0x00008268, 0xffffffff},

	{0x00008268, 0xffffffff},

	{0x0000826c, 0x0000ffff},

	{0x0000826c, 0x0000ffff},

	{0x00008270, 0x00000000},

	{0x00008270, 0x00000000},

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -145,14 +145,14 @@ channel_detector_create(struct dfs_pattern_detector *dpd, u16 freq) 
	struct channel_detector *cd;

	struct channel_detector *cd;

	struct ath_common *common = ath9k_hw_common(dpd->ah);

	struct ath_common *common = ath9k_hw_common(dpd->ah);





	cd = kmalloc(sizeof(*cd), GFP_KERNEL);

	cd = kmalloc(sizeof(*cd), GFP_ATOMIC);

	if (cd == NULL)

	if (cd == NULL)

		goto fail;

		goto fail;





	INIT_LIST_HEAD(&cd->head);

	INIT_LIST_HEAD(&cd->head);

	cd->freq = freq;

	cd->freq = freq;

	sz = sizeof(cd->detectors) * dpd->num_radar_types;

	sz = sizeof(cd->detectors) * dpd->num_radar_types;

	cd->detectors = kzalloc(sz, GFP_KERNEL);

	cd->detectors = kzalloc(sz, GFP_ATOMIC);

	if (cd->detectors == NULL)

	if (cd->detectors == NULL)

		goto fail;

		goto fail;

drivers/net/wireless/ath/ath9k/dfs_pri_detector.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ static bool pulse_queue_enqueue(struct pri_detector *pde, u64 ts) 
{

{

	struct pulse_elem *p = pool_get_pulse_elem();

	struct pulse_elem *p = pool_get_pulse_elem();

	if (p == NULL) {

	if (p == NULL) {

		p = kmalloc(sizeof(*p), GFP_KERNEL);

		p = kmalloc(sizeof(*p), GFP_ATOMIC);

		if (p == NULL) {

		if (p == NULL) {

			DFS_POOL_STAT_INC(pulse_alloc_error);

			DFS_POOL_STAT_INC(pulse_alloc_error);

			return false;

			return false;
@@ -277,7 +277,7 @@ static bool pseq_handler_create_sequences(struct pri_detector *pde, 
		ps.deadline_ts = ps.first_ts + ps.dur;

		ps.deadline_ts = ps.first_ts + ps.dur;

		new_ps = pool_get_pseq_elem();

		new_ps = pool_get_pseq_elem();

		if (new_ps == NULL) {

		if (new_ps == NULL) {

			new_ps = kmalloc(sizeof(*new_ps), GFP_KERNEL);

			new_ps = kmalloc(sizeof(*new_ps), GFP_ATOMIC);

			if (new_ps == NULL) {

			if (new_ps == NULL) {

				DFS_POOL_STAT_INC(pseq_alloc_error);

				DFS_POOL_STAT_INC(pseq_alloc_error);

				return false;

				return false;

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -796,7 +796,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv) 
	 * required version.

	 * required version.

	 */

	 */

	if (priv->fw_version_major != MAJOR_VERSION_REQ ||

	if (priv->fw_version_major != MAJOR_VERSION_REQ ||

	    priv->fw_version_minor != MINOR_VERSION_REQ) {

	    priv->fw_version_minor < MINOR_VERSION_REQ) {

		dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version %d.%d\n",

		dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version %d.%d\n",

			MAJOR_VERSION_REQ, MINOR_VERSION_REQ);

			MAJOR_VERSION_REQ, MINOR_VERSION_REQ);

		return -EINVAL;

		return -EINVAL;

drivers/net/wireless/b43/phy_n.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -5109,7 +5109,8 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) 
#endif

#endif

#ifdef CONFIG_B43_SSB

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

	case B43_BUS_SSB:

		/* FIXME */

		ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco,

					    avoid);

		break;

		break;

#endif

#endif

	}

	}