diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
| commit | b32cb6fcf1f81449a388f3fd2be14454a2c644da (patch) | |
| tree | 8f1341a2efeab11e0bbe263cba47085cbfeea8f0 /net/wireless/ethtool.c | |
| parent | Merge branch 'smc-fixes' (diff) | |
| parent | mac80211: fix wrong 160/80+80 MHz setting (diff) | |
| download | linux-dev-b32cb6fcf1f81449a388f3fd2be14454a2c644da.tar.xz linux-dev-b32cb6fcf1f81449a388f3fd2be14454a2c644da.zip | |
Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just a few fixes:
* avoid running out of tracking space for frames that need
to be reported to userspace by using more bits
* fix beacon handling suppression by adding some relevant
elements to the CRC calculation
* fix quiet mode in action frames
* fix crash in ethtool for virt_wifi and similar
* add a missing policy entry
* fix 160 & 80+80 bandwidth to take local capabilities into
account
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/ethtool.c')
| -rw-r--r-- | net/wireless/ethtool.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c index a9c0f368db5d..24e18405cdb4 100644 --- a/net/wireless/ethtool.c +++ b/net/wireless/ethtool.c @@ -7,9 +7,13 @@ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct wireless_dev *wdev = dev->ieee80211_ptr; + struct device *pdev = wiphy_dev(wdev->wiphy); - strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, - sizeof(info->driver)); + if (pdev->driver) + strlcpy(info->driver, pdev->driver->name, + sizeof(info->driver)); + else + strlcpy(info->driver, "N/A", sizeof(info->driver)); strlcpy(info->version, init_utsname()->release, sizeof(info->version)); |