Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
wireless
/
ath
/
wil6210
/
netdev.c
diff --git
a/kernel/drivers/net/wireless/ath/wil6210/netdev.c
b/kernel/drivers/net/wireless/ath/wil6210/netdev.c
index
f2f7ea2
..
e3b3c8f
100644
(file)
--- a/
kernel/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/
kernel/drivers/net/wireless/ath/wil6210/netdev.c
@@
-24,6
+24,11
@@
static int wil_open(struct net_device *ndev)
wil_dbg_misc(wil, "%s()\n", __func__);
wil_dbg_misc(wil, "%s()\n", __func__);
+ if (debug_fw) {
+ wil_err(wil, "%s() while in debug_fw mode\n", __func__);
+ return -EINVAL;
+ }
+
return wil_up(wil);
}
return wil_up(wil);
}
@@
-127,7
+132,7
@@
static void wil_dev_setup(struct net_device *dev)
dev->tx_queue_len = WIL_TX_Q_LEN_DEFAULT;
}
dev->tx_queue_len = WIL_TX_Q_LEN_DEFAULT;
}
-void *wil_if_alloc(struct device *dev
, void __iomem *csr
)
+void *wil_if_alloc(struct device *dev)
{
struct net_device *ndev;
struct wireless_dev *wdev;
{
struct net_device *ndev;
struct wireless_dev *wdev;
@@
-142,7
+147,6
@@
void *wil_if_alloc(struct device *dev, void __iomem *csr)
}
wil = wdev_to_wil(wdev);
}
wil = wdev_to_wil(wdev);
- wil->csr = csr;
wil->wdev = wdev;
wil_dbg_misc(wil, "%s()\n", __func__);
wil->wdev = wdev;
wil_dbg_misc(wil, "%s()\n", __func__);
@@
-169,7
+173,10
@@
void *wil_if_alloc(struct device *dev, void __iomem *csr)
wil_set_ethtoolops(ndev);
ndev->ieee80211_ptr = wdev;
ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
wil_set_ethtoolops(ndev);
ndev->ieee80211_ptr = wdev;
ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
- NETIF_F_SG | NETIF_F_GRO;
+ NETIF_F_SG | NETIF_F_GRO |
+ NETIF_F_TSO | NETIF_F_TSO6 |
+ NETIF_F_RXHASH;
+
ndev->features |= ndev->hw_features;
SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
wdev->netdev = ndev;
ndev->features |= ndev->hw_features;
SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
wdev->netdev = ndev;