linux-next: manual merge of the wireless-next tree with the net tree

linux-next: manual merge of the wireless-next tree with the net tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 4745 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c

between commit:

  7ed5dce55fa83 ("wifi: brcmfmac: map msgbuf RX packet IDs bidirectional")

from the net tree and commit:

  09063ccd75da0 ("wifi: brcmfmac: Add BCM4388 support")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index ff47d4827722e,5ad46d7ec663f..0000000000000
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@@ -12,6 -12,7 +12,7 @@@
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  
+ #include <brcm_hw_ids.h>
  #include <brcmu_utils.h>
  #include <brcmu_wifi.h>
  
@@@ -47,9 -48,11 +48,11 @@@
  #define MSGBUF_TYPE_RX_CMPLT			0x12
  #define MSGBUF_TYPE_LPBK_DMAXFER		0x13
  #define MSGBUF_TYPE_LPBK_DMAXFER_CMPLT		0x14
+ #define MSGBUF_TYPE_H2D_MAILBOX_DATA		0x23
+ #define MSGBUF_TYPE_D2H_MAILBOX_DATA		0x24
  
  #define NR_TX_PKTIDS				2048
- #define NR_RX_PKTIDS				1024
+ #define NR_RX_PKTIDS				2048
  
  #define BRCMF_IOCTL_REQ_PKTID			0xFFFE
  
@@@ -218,6 -221,19 +221,19 @@@ struct msgbuf_flowring_flush_resp 
  	__le32				rsvd0[3];
  };
  
+ struct msgbuf_h2d_mailbox_data {
+ 	struct msgbuf_common_hdr	msg;
+ 	__le32				data;
+ 	__le32				rsvd0[7];
+ };
+ 
+ struct msgbuf_d2h_mailbox_data {
+ 	struct msgbuf_common_hdr	msg;
+ 	struct msgbuf_completion_hdr	compl_hdr;
+ 	__le32				data;
+ 	__le32				rsvd0[2];
+ };
+ 
  struct brcmf_msgbuf_work_item {
  	struct list_head queue;
  	u32 flowid;
@@@ -315,7 -331,6 +331,6 @@@ brcmf_msgbuf_init_pktids(u32 nr_array_e
  	return pktids;
  }
  
- 
  static int
  brcmf_msgbuf_alloc_pktid(struct device *dev,
  			 struct brcmf_msgbuf_pktids *pktids,
@@@ -1319,6 -1334,15 +1334,15 @@@ brcmf_msgbuf_process_flow_ring_delete_r
  	brcmf_msgbuf_remove_flowring(msgbuf, flowid);
  }
  
+ static void brcmf_msgbuf_process_d2h_mailbox_data(struct brcmf_msgbuf *msgbuf,
+ 						  void *buf)
+ {
+ 	struct msgbuf_d2h_mailbox_data *d2h_mb_data = buf;
+ 
+ 	brcmf_bus_d2h_mb_rx(msgbuf->drvr->bus_if,
+ 			    le32_to_cpu(d2h_mb_data->data));
+ }
+ 
  
  static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
  {
@@@ -1362,6 -1386,10 +1386,10 @@@
  		brcmf_dbg(MSGBUF, "MSGBUF_TYPE_RX_CMPLT\n");
  		brcmf_msgbuf_process_rx_complete(msgbuf, buf);
  		break;
+ 	case MSGBUF_TYPE_D2H_MAILBOX_DATA:
+ 		brcmf_dbg(MSGBUF, "MSGBUF_TYPE_D2H_MAILBOX_DATA\n");
+ 		brcmf_msgbuf_process_d2h_mailbox_data(msgbuf, buf);
+ 		break;
  	default:
  		bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
  		break;
@@@ -1500,6 -1528,35 +1528,35 @@@ void brcmf_msgbuf_delete_flowring(struc
  	}
  }
  
+ int brcmf_msgbuf_h2d_mb_write(struct brcmf_pub *drvr, u32 data)
+ {
+ 	struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
+ 	struct brcmf_commonring *commonring;
+ 	struct msgbuf_h2d_mailbox_data *request;
+ 	void *ret_ptr;
+ 	int err;
+ 
+ 	commonring = msgbuf->commonrings[BRCMF_H2D_MSGRING_CONTROL_SUBMIT];
+ 	brcmf_commonring_lock(commonring);
+ 	ret_ptr = brcmf_commonring_reserve_for_write(commonring);
+ 	if (!ret_ptr) {
+ 		bphy_err(drvr, "Failed to reserve space in commonring\n");
+ 		brcmf_commonring_unlock(commonring);
+ 		return -ENOMEM;
+ 	}
+ 
+ 	request = (struct msgbuf_h2d_mailbox_data *)ret_ptr;
+ 	memset(request, 0, sizeof(*request));
+ 	request->msg.msgtype = MSGBUF_TYPE_H2D_MAILBOX_DATA;
+ 	request->msg.ifidx = 0xff;
+ 	request->data = cpu_to_le32(data);
+ 
+ 	err = brcmf_commonring_write_complete(commonring);
+ 	brcmf_commonring_unlock(commonring);
+ 
+ 	return err;
+ }
+ 
  #ifdef DEBUG
  static int brcmf_msgbuf_stats_read(struct seq_file *seq, void *data)
  {
@@@ -1638,8 -1695,10 +1695,8 @@@ int brcmf_proto_msgbuf_attach(struct br
  						     DMA_TO_DEVICE);
  	if (!msgbuf->tx_pktids)
  		goto fail;
 -	/* BCM4388 firmware also reads from posted RX buffers. */
  	msgbuf->rx_pktids = brcmf_msgbuf_init_pktids(NR_RX_PKTIDS,
 -			drvr->bus_if->chip == BRCM_CC_4388_CHIP_ID ?
 -			DMA_BIDIRECTIONAL : DMA_FROM_DEVICE);
 +						     DMA_BIDIRECTIONAL);
  	if (!msgbuf->rx_pktids)
  		goto fail;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2764 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/mlme.c

between commit:

  a72c01a94f1d ("mac80211: mlme: check for null after calling kmemdup")

from the net tree and commit:

  820acc810fb6 ("mac80211: Add EHT capabilities to association/probe request")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/mac80211/mlme.c
index 20b57ddf149c,197cad4a2768..000000000000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -671,7 -692,49 +692,49 @@@ static void ieee80211_add_he_ie(struct 
  	ieee80211_ie_build_he_6ghz_cap(sdata, skb);
  }
  
+ static void ieee80211_add_eht_ie(struct ieee80211_sub_if_data *sdata,
+ 				 struct sk_buff *skb,
+ 				 struct ieee80211_supported_band *sband)
+ {
+ 	u8 *pos;
+ 	const struct ieee80211_sta_he_cap *he_cap;
+ 	const struct ieee80211_sta_eht_cap *eht_cap;
+ 	struct ieee80211_chanctx_conf *chanctx_conf;
+ 	u8 eht_cap_size;
+ 	bool reg_cap = false;
+ 
+ 	rcu_read_lock();
+ 	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+ 	if (!WARN_ON_ONCE(!chanctx_conf))
+ 		reg_cap = cfg80211_chandef_usable(sdata->wdev.wiphy,
+ 						  &chanctx_conf->def,
+ 						  IEEE80211_CHAN_NO_HE |
+ 						  IEEE80211_CHAN_NO_EHT);
+ 	rcu_read_unlock();
+ 
+ 	he_cap = ieee80211_get_he_iftype_cap(sband,
+ 					     ieee80211_vif_type_p2p(&sdata->vif));
+ 	eht_cap = ieee80211_get_eht_iftype_cap(sband,
+ 					       ieee80211_vif_type_p2p(&sdata->vif));
+ 
+ 	/*
+ 	 * EHT capabilities element is only added if the HE capabilities element
+ 	 * was added so assume that 'he_cap' is valid and don't check it.
+ 	 */
+ 	if (WARN_ON(!he_cap || !eht_cap || !reg_cap))
+ 		return;
+ 
+ 	eht_cap_size =
+ 		2 + 1 + sizeof(eht_cap->eht_cap_elem) +
+ 		ieee80211_eht_mcs_nss_size(&he_cap->he_cap_elem,
+ 					   &eht_cap->eht_cap_elem) +
+ 		ieee80211_eht_ppe_size(eht_cap->eht_ppe_thres[0],
+ 				       eht_cap->eht_cap_elem.phy_cap_info);
+ 	pos = skb_put(skb, eht_cap_size);
+ 	ieee80211_ie_build_eht_cap(pos, he_cap, eht_cap, pos + eht_cap_size);
+ }
+ 
 -static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
 +static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
  {
  	struct ieee80211_local *local = sdata->local;
  	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between commit 3a5a423bb958 ("nl80211: fix attrbuf
access race by allocating a separate one") from the net tree and commit
940d0ac9dbe3 ("cfg80211: fix rtnl leak in wiphy dump error cases") from
the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/wireless/nl80211.c
index 51d660e,e402819..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -1550,7 -1542,7 +1547,8 @@@ static int nl80211_dump_wiphy(struct sk
  
  			netdev = dev_get_by_index(sock_net(skb->sk), ifidx);
  			if (!netdev) {
+ 				rtnl_unlock();
 +				kfree(tb);
  				return -ENODEV;
  			}
  			if (netdev->ieee80211_ptr) {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2506 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/mac80211/iface.c between commit ac20976dcaee ("mac80211: Allow single
vif mac address change with addr_mask") from the net tree and commit
31eba5bc56a9 ("mac80211: support active monitor interfaces") from the
wireless-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/mac80211/iface.c
index 7c3ba86,7cabaf2..0000000
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@@ -159,10 -159,10 +159,11 @@@ static int ieee80211_change_mtu(struct 
  	return 0;
  }
  
- static int ieee80211_verify_mac(struct ieee80211_sub_if_data *sdata, u8 *addr)
 -static int ieee80211_verify_mac(struct ieee80211_local *local, u8 *addr,
++static int ieee80211_verify_mac(struct ieee80211_sub_if_data *sdata, u8 *addr,
+ 				bool check_dup)
  {
 -	struct ieee80211_sub_if_data *sdata;
 +	struct ieee80211_local *local = sdata->local;
 +	struct ieee80211_sub_if_data *iter;
  	u64 new, mask, tmp;
  	u8 *m;
  	int ret = 0;
@@@ -180,16 -180,16 +181,19 @@@
  		((u64)m[2] << 3*8) | ((u64)m[3] << 2*8) |
  		((u64)m[4] << 1*8) | ((u64)m[5] << 0*8);
  
+ 	if (!check_dup)
+ 		return ret;
  
  	mutex_lock(&local->iflist_mtx);
 -	list_for_each_entry(sdata, &local->interfaces, list) {
 -		if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
 -		    !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
 +	list_for_each_entry(iter, &local->interfaces, list) {
 +		if (iter == sdata)
  			continue;
  
- 		if (iter->vif.type == NL80211_IFTYPE_MONITOR)
 -		m = sdata->vif.addr;
++		if (iter->vif.type == NL80211_IFTYPE_MONITOR &&
++		    !(iter->u.mntr_flags & MONITOR_FLAG_ACTIVE))
 +			continue;
 +
 +		m = iter->vif.addr;
  		tmp =	((u64)m[0] << 5*8) | ((u64)m[1] << 4*8) |
  			((u64)m[2] << 3*8) | ((u64)m[3] << 2*8) |
  			((u64)m[4] << 1*8) | ((u64)m[5] << 0*8);
@@@ -213,7 -214,11 +218,11 @@@ static int ieee80211_change_mac(struct 
  	if (ieee80211_sdata_running(sdata))
  		return -EBUSY;
  
- 	ret = ieee80211_verify_mac(sdata, sa->sa_data);
+ 	if (sdata->vif.type == NL80211_IFTYPE_MONITOR &&
+ 	    !(sdata->u.mntr_flags & MONITOR_FLAG_ACTIVE))
+ 		check_dup = false;
+ 
 -	ret = ieee80211_verify_mac(sdata->local, sa->sa_data, check_dup);
++	ret = ieee80211_verify_mac(sdata, sa->sa_data, check_dup);
  	if (ret)
  		return ret;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2094 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/main.c between commit 4b883f021b9c
("ath9k: fix rx flush handling") from the net tree and commit
1381559ba48a ("ath9k: clean up processing of pending tx frames on reset")
from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/ath/ath9k/main.c
index dd91f8f,3e5082c..0000000
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -182,7 -182,7 +182,7 @@@ static void ath_restart_work(struct ath
  	ath_start_ani(sc);
  }
  
- static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
 -static bool ath_prepare_reset(struct ath_softc *sc, bool flush)
++static bool ath_prepare_reset(struct ath_softc *sc)
  {
  	struct ath_hw *ah = sc->sc_ah;
  	bool ret = true;
@@@ -196,12 -196,20 +196,12 @@@
  	ath9k_debug_samp_bb_mac(sc);
  	ath9k_hw_disable_interrupts(ah);
  
- 	if (!ath_stoprecv(sc))
+ 	if (!ath_drain_all_txq(sc))
  		ret = false;
  
- 	if (!ath_drain_all_txq(sc, retry_tx))
+ 	if (!ath_stoprecv(sc))
  		ret = false;
  
 -	if (!flush) {
 -		if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
 -			ath_rx_tasklet(sc, 1, true);
 -		ath_rx_tasklet(sc, 1, false);
 -	} else {
 -		ath_flushrecv(sc);
 -	}
 -
  	return ret;
  }
  
@@@ -271,7 -278,8 +270,7 @@@ static int ath_reset_internal(struct at
  		hchan = ah->curchan;
  	}
  
- 	if (!ath_prepare_reset(sc, retry_tx))
 -	if (!ath_prepare_reset(sc, flush))
++	if (!ath_prepare_reset(sc))
  		fastcc = false;
  
  	ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@@ -797,7 -801,7 +794,7 @@@ static void ath9k_stop(struct ieee80211
  		ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
  	}
  
- 	ath_prepare_reset(sc, false);
 -	ath_prepare_reset(sc, true);
++	ath_prepare_reset(sc);
  
  	if (sc->rx.frag) {
  		dev_kfree_skb_any(sc->rx.frag);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2063 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit d012d04e4d63
("iwlwifi: disable the buggy chain extension feature in HW") from the net
tree and commit 4beaf6c2f8af ("iwlwifi: s/txq_setup/txq_enable") from the
wireless-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index cb951ad,1eabb83..0000000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1058,11 -1054,17 +1054,22 @@@ static void iwl_tx_start(struct iwl_tra
  	iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
  		       trans_pcie->scd_bc_tbls.dma >> 10);
  
 +	/* The chain extension of the SCD doesn't work well. This feature is
 +	 * enabled by default by the HW, so we need to disable it manually.
 +	 */
 +	iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
 +
+ 	for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
+ 		int fifo = trans_pcie->setup_q_to_fifo[i];
+ 
+ 		__iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION,
+ 					    IWL_TID_NON_QOS,
+ 					    SCD_FRAME_LIMIT, 0);
+ 	}
+ 
+ 	/* Activate all Tx DMA/FIFO channels */
+ 	iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
+ 
  	/* Enable DMA channel */
  	for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
  		iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
@@@ -1356,10 -1317,10 +1322,10 @@@ static int iwl_trans_pcie_tx(struct iwl
  	iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
  
  	dma_sync_single_for_device(trans->dev, txcmd_phys, firstlen,
- 			DMA_BIDIRECTIONAL);
+ 				   DMA_BIDIRECTIONAL);
  
  	trace_iwlwifi_dev_tx(trans->dev,
 -			     &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
 +			     &txq->tfds[txq->q.write_ptr],
  			     sizeof(struct iwl_tfd),
  			     &dev_cmd->hdr, firstlen,
  			     skb->data + hdr_len, secondlen);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

Hi John, Dave,

On Tue, 12 Jun 2012 11:41:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/pcie/trans.c between commit d012d04e4d63
> ("iwlwifi: disable the buggy chain extension feature in HW") from the net
> tree and commit 4beaf6c2f8af ("iwlwifi: s/txq_setup/txq_enable") from the
> wireless-next tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

So this conflict has now been fixed up in both the net-next (commit
43b03f1f6d68) and wireless-next (commit 627ae3ddd6f9) trees, but slightly
differently :-(  I used the version from the net-next tree.

Just a heads up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the wireless-next tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in MAINTAINERS between commit ce466579b1c9 ("wireless: add my new trees to MAINTAINERS") from the net tree and commit 491b26b40222 ("wireless: update wireless URLs") from the wireless-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc MAINTAINERS
index f6e62de,c5fd905..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4351,9 -4339,8 +4351,9 @@@ F:	arch/m68k/hp300
  MAC80211
  M:	Johannes Berg <johannes@sipsolutions.net>
  L:	linux-wireless@vger.kernel.org
- W:	http://linuxwireless.org/
+ W:	http://wireless.kernel.org/
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:	Maintained
  F:	Documentation/networking/mac80211-injection.txt
  F:	include/net/mac80211.h
@@@ -4363,9 -4350,8 +4363,9 @@@ MAC80211 PID RATE CONTRO
  M:	Stefano Brivio <stefano.brivio@polimi.it>
  M:	Mattias Nissler <mattias.nissler@gmx.de>
  L:	linux-wireless@vger.kernel.org
- W:	http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+ W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:	Maintained
  F:	net/mac80211/rc80211_pid*
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]