mt76: sync with trunk r47143, add backports for compat with the older mac80211 version

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47145 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Felix Fietkau 2015-10-05 22:38:39 +00:00
parent a42d0f389e
commit 53a0131c68
4 changed files with 24 additions and 20 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mt76
PKG_VERSION:=2015-06-15
PKG_VERSION:=2015-10-05
PKG_RELEASE=1
PKG_LICENSE:=GPLv2
@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=ec91841868a554375b3019bcfaa13ae6d20fe91c
PKG_SOURCE_VERSION:=0169cab3e4e8377ab5a508895ec893c4e00dbbc5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

View File

@ -0,0 +1,12 @@
--- a/init.c
+++ b/init.c
@@ -16,6 +16,9 @@
#include "eeprom.h"
#include "mcu.h"
+#define ieee80211_hw_set(hw, flag) \
+ do { (hw)->flags |= IEEE80211_HW_##flag; } while(0)
+
static bool
mt76_wait_for_mac(struct mt76_dev *dev)
{

View File

@ -0,0 +1,10 @@
--- a/init.c
+++ b/init.c
@@ -816,7 +816,6 @@ int mt76_register_device(struct mt76_dev
ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
ieee80211_hw_set(hw, AMPDU_AGGREGATION);
ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);
- ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
hw->sta_data_size = sizeof(struct mt76_sta);
hw->vif_data_size = sizeof(struct mt76_vif);

View File

@ -1,18 +0,0 @@
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 18 Jul 2015 17:51:24 +0200
Subject: [PATCH] dma: fix rx buffer allocation size
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/dma.c
+++ b/dma.c
@@ -158,7 +158,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, s
while (q->queued < q->ndesc - 1) {
int offset = mt76_rx_buf_offset(dev);
- buf = kzalloc(len, GFP_ATOMIC);
+ buf = kzalloc(q->buf_size, GFP_ATOMIC);
if (!buf)
break;