mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
0b2c42ced2
This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
945 B
Diff
35 lines
945 B
Diff
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
|
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
|
|
@@ -11481,6 +11481,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)
|
|
{
|
|
@@ -11529,15 +11538,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,
|