a8f63a0717
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>
34 lines
945 B
Diff
34 lines
945 B
Diff
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
|
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
|
@@ -11506,6 +11506,15 @@ static const struct attribute_group ipw_
|
|
.attrs = ipw_sysfs_entries,
|
|
};
|
|
|
|
+#if LINUX_VERSION_IS_LESS(4,10,0)
|
|
+static int __change_mtu(struct net_device *ndev, int new_mtu){
|
|
+ if (new_mtu < 68 || new_mtu > LIBIPW_DATA_LEN)
|
|
+ return -EINVAL;
|
|
+ ndev->mtu = new_mtu;
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
#ifdef CPTCFG_IPW2200_PROMISCUOUS
|
|
static int ipw_prom_open(struct net_device *dev)
|
|
{
|
|
@@ -11554,15 +11563,6 @@ static netdev_tx_t ipw_prom_hard_start_x
|
|
return NETDEV_TX_OK;
|
|
}
|
|
|
|
-#if LINUX_VERSION_IS_LESS(4,10,0)
|
|
-static int __change_mtu(struct net_device *ndev, int new_mtu){
|
|
- if (new_mtu < 68 || new_mtu > LIBIPW_DATA_LEN)
|
|
- return -EINVAL;
|
|
- ndev->mtu = new_mtu;
|
|
- return 0;
|
|
-}
|
|
-#endif
|
|
-
|
|
static const struct net_device_ops ipw_prom_netdev_ops = {
|
|
#if LINUX_VERSION_IS_LESS(4,10,0)
|
|
.ndo_change_mtu = __change_mtu,
|