Includes the following changes:9edff13abdmac80211: disable potentially harmful PS software retry for A-MPDU sessions75216a76b0mac80211: backport upstream fix for CSA in IBSS mode368cc8ef47mac80211: update brcmfmac backporting brcmf_err cleanups66a63d25c4mac80211: fix build on linux 3.189eacb9d7fcrt2x00: mt7620: lots of improvementsfd94fa61a7mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9649e766a64mac80211: update to wireless-testing 2017-01-3147540afa5dath9k: add a warning to the tx99 config optionb367eef21dmac80211: rt2x00: add support for external LNA on MT76209200e168f2mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau <nbd@nbd.name>
21 lines
548 B
Diff
21 lines
548 B
Diff
--- a/net/mac80211/iface.c
|
|
+++ b/net/mac80211/iface.c
|
|
@@ -1133,7 +1133,7 @@ static u16 ieee80211_netdev_select_queue
|
|
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
|
|
}
|
|
|
|
-static void
|
|
+static struct rtnl_link_stats64 *
|
|
ieee80211_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
|
{
|
|
int i;
|
|
@@ -1158,6 +1158,8 @@ ieee80211_get_stats64(struct net_device
|
|
stats->rx_bytes += rx_bytes;
|
|
stats->tx_bytes += tx_bytes;
|
|
}
|
|
+
|
|
+ return stats;
|
|
}
|
|
|
|
static const struct net_device_ops ieee80211_dataif_ops = {
|