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

Commit a18da8f6 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2019-09-05' of https://github.com/nbd168/wireless 

mt76 patches for 5.4

* beacon tx fix for mt76x02
* sparse/checkpatch warning fixes
* DFS pattern detector for mt7615 (DFS channels not enabled yet)
* CSA support for mt7615
* mt7615 cleanup/fixes
* mt7615 rate control improvements
* usb fixes
* mt7615 powersave buffering fix
* new device support for mt76x0
* support for more ciphers in mt7615
* watchdog time fixes
* smart carrier sense on mt7615
* survey support on mt7615
* multiple interfaces on mt76x02u
* calibration data fix for mt7615
* fix for sending BAR after disassoc
parents 84b0b663 0e6a29e4

drivers/net/wireless/mediatek/mt76/agg-rx.c

+13 −23
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (C) 2018 Felix Fietkau <nbd@nbd.name>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include "mt76.h"
@@ -34,7 +23,8 @@ mt76_aggr_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames, int idx) 
}



static void

mt76_rx_aggr_release_frames(struct mt76_rx_tid *tid, struct sk_buff_head *frames,

mt76_rx_aggr_release_frames(struct mt76_rx_tid *tid,

			    struct sk_buff_head *frames,

			    u16 head)

{

	int idx;
@@ -74,15 +64,14 @@ mt76_rx_aggr_check_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames) 
	for (idx = (tid->head + 1) % tid->size;

	     idx != start && nframes;

	     idx = (idx + 1) % tid->size) {



		skb = tid->reorder_buf[idx];

		if (!skb)

			continue;



		nframes--;

		status = (struct mt76_rx_status *)skb->cb;

		if (!time_after(jiffies, status->reorder_time +

					 REORDER_TIMEOUT))

		if (!time_after(jiffies,

				status->reorder_time + REORDER_TIMEOUT))

			continue;



		mt76_rx_aggr_release_frames(tid, frames, status->seqno);
@@ -233,7 +222,8 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames) 
	tid->nframes++;

	mt76_rx_aggr_release_head(tid, frames);



	ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work, REORDER_TIMEOUT);

	ieee80211_queue_delayed_work(tid->dev->hw, &tid->reorder_work,

				     REORDER_TIMEOUT);



out:

	spin_unlock_bh(&tid->lock);

drivers/net/wireless/mediatek/mt76/debugfs.c

+1 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include "mt76.h"

drivers/net/wireless/mediatek/mt76/dma.c

+8 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <linux/dma-mapping.h>
@@ -442,6 +431,12 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) 
	mt76_dma_rx_cleanup(dev, q);

	mt76_dma_sync_idx(dev, q);

	mt76_dma_rx_fill(dev, q);



	if (!q->rx_head)

		return;



	dev_kfree_skb(q->rx_head);

	q->rx_head = NULL;

}



static void

drivers/net/wireless/mediatek/mt76/dma.h

+1 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: ISC */

/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#ifndef __MT76_DMA_H

#define __MT76_DMA_H

drivers/net/wireless/mediatek/mt76/eeprom.c

+1 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/of.h>

#include <linux/of_net.h>