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

Commit b510446b authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

parents 8c6e83d6 64513ef4

Documentation/DocBook/80211.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -437,7 +437,7 @@ 
      </section>

      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe

!Finclude/net/mac80211.h ieee80211_sta_eosp

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_frame_release_type

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

drivers/bcma/sprom.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,7 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	}

	}





	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);

	SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);

	SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);





	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,

	SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,

	     SSB_SPROM4_TXPID2G0_SHIFT);

	     SSB_SPROM4_TXPID2G0_SHIFT);

drivers/bluetooth/btmrvl_sdio.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { 
};

};





static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

	.helper		= "sd8688_helper.bin",

	.helper		= "mrvl/sd8688_helper.bin",

	.firmware	= "sd8688.bin",

	.firmware	= "mrvl/sd8688.bin",

	.reg		= &btmrvl_reg_8688,

	.reg		= &btmrvl_reg_8688,

	.sd_blksz_fw_dl	= 64,

	.sd_blksz_fw_dl	= 64,

};

};
@@ -1185,7 +1185,7 @@ MODULE_AUTHOR("Marvell International Ltd."); 
MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);

MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);

MODULE_VERSION(VERSION);

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");

MODULE_FIRMWARE("sd8688_helper.bin");

MODULE_FIRMWARE("mrvl/sd8688_helper.bin");

MODULE_FIRMWARE("sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
 
MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

drivers/net/wireless/ath/ar5523/ar5523.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1091,7 +1091,7 @@ static int ar5523_set_rts_threshold(struct ieee80211_hw *hw, u32 value) 
	return ret;

	return ret;

}

}





static void ar5523_flush(struct ieee80211_hw *hw, bool drop)

static void ar5523_flush(struct ieee80211_hw *hw, u32 queues, bool drop)

{

{

	struct ar5523 *ar = hw->priv;

	struct ar5523 *ar = hw->priv;

drivers/net/wireless/ath/ath6kl/trace.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ TRACE_EVENT(ath6kl_wmi_cmd, 
	),

	),





	TP_printk(

	TP_printk(

		"id %d len %d",

		"id %d len %zd",

		__entry->id, __entry->buf_len

		__entry->id, __entry->buf_len

	)

	)

);

);
@@ -76,7 +76,7 @@ TRACE_EVENT(ath6kl_wmi_event, 
	),

	),





	TP_printk(

	TP_printk(

		"id %d len %d",

		"id %d len %zd",

		__entry->id, __entry->buf_len

		__entry->id, __entry->buf_len

	)

	)

);

);
@@ -108,7 +108,7 @@ TRACE_EVENT(ath6kl_sdio, 
	),

	),





	TP_printk(

	TP_printk(

		"%s addr 0x%x flags 0x%x len %d\n",

		"%s addr 0x%x flags 0x%x len %zd\n",

		__entry->tx ? "tx" : "rx",

		__entry->tx ? "tx" : "rx",

		__entry->addr,

		__entry->addr,

		__entry->flags,

		__entry->flags,
@@ -161,7 +161,7 @@ TRACE_EVENT(ath6kl_sdio_scat, 
	),

	),





	TP_printk(

	TP_printk(

		"%s addr 0x%x flags 0x%x entries %d total_len %d\n",

		"%s addr 0x%x flags 0x%x entries %d total_len %zd\n",

		__entry->tx ? "tx" : "rx",

		__entry->tx ? "tx" : "rx",

		__entry->addr,

		__entry->addr,

		__entry->flags,

		__entry->flags,
@@ -186,7 +186,7 @@ TRACE_EVENT(ath6kl_sdio_irq, 
	),

	),





	TP_printk(

	TP_printk(

		"irq len %d\n", __entry->buf_len

		"irq len %zd\n", __entry->buf_len

	)

	)

);

);
@@ -211,7 +211,7 @@ TRACE_EVENT(ath6kl_htc_rx, 
	),

	),





	TP_printk(

	TP_printk(

		"status %d endpoint %d len %d\n",

		"status %d endpoint %d len %zd\n",

		__entry->status,

		__entry->status,

		__entry->endpoint,

		__entry->endpoint,

		__entry->buf_len

		__entry->buf_len
@@ -239,7 +239,7 @@ TRACE_EVENT(ath6kl_htc_tx, 
	),

	),





	TP_printk(

	TP_printk(

		"status %d endpoint %d len %d\n",

		"status %d endpoint %d len %zd\n",

		__entry->status,

		__entry->status,

		__entry->endpoint,

		__entry->endpoint,

		__entry->buf_len

		__entry->buf_len