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

Commit 1c659a44 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents ccb19d26 4f3d09de

drivers/net/wireless/b43/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ config B43_BCMA 
	depends on B43 && BCMA

	default y



config B43_BCMA_EXTRA

	bool "Hardware support that overlaps with the brcmsmac driver"

	depends on B43_BCMA

	default n if BRCMSMAC || BRCMSMAC_MODULE

	default	y



config B43_SSB

	bool

	depends on B43 && SSB

drivers/net/wireless/b43/main.c

+2 −0
Original line number Diff line number Diff line
@@ -116,8 +116,10 @@ MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO"); 
#ifdef CONFIG_B43_BCMA

static const struct bcma_device_id b43_bcma_tbl[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),

#ifdef CONFIG_B43_BCMA_EXTRA

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),

#endif

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),

	BCMA_CORETABLE_END

};

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

+9 −1
Original line number Diff line number Diff line
@@ -7981,13 +7981,21 @@ int brcms_c_get_curband(struct brcms_c_info *wlc) 


void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop)

{

	int timeout = 20;



	/* flush packet queue when requested */

	if (drop)

		brcmu_pktq_flush(&wlc->pkt_queue->q, false, NULL, NULL);



	/* wait for queue and DMA fifos to run dry */

	while (!pktq_empty(&wlc->pkt_queue->q) || brcms_txpktpendtot(wlc) > 0)

	while (!pktq_empty(&wlc->pkt_queue->q) || brcms_txpktpendtot(wlc) > 0) {

		brcms_msleep(wlc->wl, 1);



		if (--timeout == 0)

			break;

	}



	WARN_ON_ONCE(timeout == 0);

}



void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc, u8 interval)

net/mac80211/debugfs_key.c

+4 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ KEY_OPS(key); 
void ieee80211_debugfs_key_add(struct ieee80211_key *key)

{

	static int keycount;

	char buf[50];

	char buf[100];

	struct sta_info *sta;



	if (!key->local->debugfs.keys)
@@ -244,7 +244,8 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) 


	sta = key->sta;

	if (sta) {

		sprintf(buf, "../../stations/%pM", sta->sta.addr);

		sprintf(buf, "../../netdev:%s/stations/%pM",

			sta->sdata->name, sta->sta.addr);

		key->debugfs.stalink =

			debugfs_create_symlink("station", key->debugfs.dir, buf);

	}

net/mac80211/mesh_hwmp.c

+4 −4
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags, 
	int hdr_len = offsetof(struct ieee80211_mgmt, u.action.u.mesh_action) +

		      sizeof(mgmt->u.action.u.mesh_action);



	skb = dev_alloc_skb(local->hw.extra_tx_headroom +

	skb = dev_alloc_skb(local->tx_headroom +

			    hdr_len +

			    2 + 37); /* max HWMP IE */

	if (!skb)

		return -1;

	skb_reserve(skb, local->hw.extra_tx_headroom);

	skb_reserve(skb, local->tx_headroom);

	mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);

	memset(mgmt, 0, hdr_len);

	mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
@@ -250,12 +250,12 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, 
	if (time_before(jiffies, ifmsh->next_perr))

		return -EAGAIN;



	skb = dev_alloc_skb(local->hw.extra_tx_headroom +

	skb = dev_alloc_skb(local->tx_headroom +

			    hdr_len +

			    2 + 15 /* PERR IE */);

	if (!skb)

		return -1;

	skb_reserve(skb, local->tx_headroom + local->hw.extra_tx_headroom);

	skb_reserve(skb, local->tx_headroom);

	mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);

	memset(mgmt, 0, hdr_len);

	mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |