diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-08-22 23:59:48 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-10-01 12:49:11 +0200 |
commit | a8f63a0717f553e0a1b37ee9212fc4cb2a801426 (patch) | |
tree | 9016b975706f35b98075167f2cf6b15add308c9b /package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch | |
parent | 1114f5dc10755e3c92b5711b420818cf9e366874 (diff) | |
download | mtk-20170518-a8f63a0717f553e0a1b37ee9212fc4cb2a801426.zip mtk-20170518-a8f63a0717f553e0a1b37ee9212fc4cb2a801426.tar.gz mtk-20170518-a8f63a0717f553e0a1b37ee9212fc4cb2a801426.tar.bz2 |
mac80211: update to backports-4.14-rc2
This updates mac80211 to backprots-4.14-rc2.
This was compile and runtime tested with ath9k, ath10k and b43
with multiple stations and ieee80211w and in different scenarios by many
other people.
To create the backports-4.14-rc2-1.tar.xz use this repository:
https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git
from tag v4.14-rc2-1
Then run this:
./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1
This also adapts the ath10k-ct and mt76 driver to the changed cfg80211
APIs and syncs the nl80211.h file in iw with the new version from
backports-4.14-rc2.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch')
-rw-r--r-- | package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch b/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch deleted file mode 100644 index 81567d8..0000000 --- a/package/kernel/mac80211/patches/323-0001-brcmfmac-Use-net_device_stats-from-struct-net_device.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 91b632803ee4e47c5a5c4dc3d8bf5abf9c16107a Mon Sep 17 00:00:00 2001 -From: Tobias Klauser <tklauser@distanz.ch> -Date: Mon, 13 Feb 2017 11:14:09 +0100 -Subject: [PATCH] brcmfmac: Use net_device_stats from struct net_device - -Instead of using a private copy of struct net_device_stats in struct -brcm_if, use stats from struct net_device. Also remove the now -unnecessary .ndo_get_stats function. - -Signed-off-by: Tobias Klauser <tklauser@distanz.ch> -Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - .../wireless/broadcom/brcm80211/brcmfmac/core.c | 26 +++++++--------------- - .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 -- - 2 files changed, 8 insertions(+), 20 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -249,10 +249,10 @@ static netdev_tx_t brcmf_netdev_start_xm - - done: - if (ret) { -- ifp->stats.tx_dropped++; -+ ndev->stats.tx_dropped++; - } else { -- ifp->stats.tx_packets++; -- ifp->stats.tx_bytes += skb->len; -+ ndev->stats.tx_packets++; -+ ndev->stats.tx_bytes += skb->len; - } - - /* Return ok: we always eat the packet */ -@@ -296,15 +296,15 @@ void brcmf_txflowblock(struct device *de - void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb) - { - if (skb->pkt_type == PACKET_MULTICAST) -- ifp->stats.multicast++; -+ ifp->ndev->stats.multicast++; - - if (!(ifp->ndev->flags & IFF_UP)) { - brcmu_pkt_buf_free_skb(skb); - return; - } - -- ifp->stats.rx_bytes += skb->len; -- ifp->stats.rx_packets++; -+ ifp->ndev->stats.rx_bytes += skb->len; -+ ifp->ndev->stats.rx_packets++; - - brcmf_dbg(DATA, "rx proto=0x%X\n", ntohs(skb->protocol)); - if (in_interrupt()) -@@ -327,7 +327,7 @@ static int brcmf_rx_hdrpull(struct brcmf - - if (ret || !(*ifp) || !(*ifp)->ndev) { - if (ret != -ENODATA && *ifp) -- (*ifp)->stats.rx_errors++; -+ (*ifp)->ndev->stats.rx_errors++; - brcmu_pkt_buf_free_skb(skb); - return -ENODATA; - } -@@ -388,7 +388,7 @@ void brcmf_txfinalize(struct brcmf_if *i - } - - if (!success) -- ifp->stats.tx_errors++; -+ ifp->ndev->stats.tx_errors++; - - brcmu_pkt_buf_free_skb(txp); - } -@@ -411,15 +411,6 @@ void brcmf_txcomplete(struct device *dev - } - } - --static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev) --{ -- struct brcmf_if *ifp = netdev_priv(ndev); -- -- brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx); -- -- return &ifp->stats; --} -- - static void brcmf_ethtool_get_drvinfo(struct net_device *ndev, - struct ethtool_drvinfo *info) - { -@@ -492,7 +483,6 @@ static int brcmf_netdev_open(struct net_ - static const struct net_device_ops brcmf_netdev_ops_pri = { - .ndo_open = brcmf_netdev_open, - .ndo_stop = brcmf_netdev_stop, -- .ndo_get_stats = brcmf_netdev_get_stats, - .ndo_start_xmit = brcmf_netdev_start_xmit, - .ndo_set_mac_address = brcmf_netdev_set_mac_address, - .ndo_set_rx_mode = brcmf_netdev_set_multicast_list ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h -@@ -171,7 +171,6 @@ enum brcmf_netif_stop_reason { - * @drvr: points to device related information. - * @vif: points to cfg80211 specific interface information. - * @ndev: associated network device. -- * @stats: interface specific network statistics. - * @multicast_work: worker object for multicast provisioning. - * @ndoffload_work: worker object for neighbor discovery offload configuration. - * @fws_desc: interface specific firmware-signalling descriptor. -@@ -187,7 +186,6 @@ struct brcmf_if { - struct brcmf_pub *drvr; - struct brcmf_cfg80211_vif *vif; - struct net_device *ndev; -- struct net_device_stats stats; - struct work_struct multicast_work; - struct work_struct ndoffload_work; - struct brcmf_fws_mac_descriptor *fws_desc; |