bf6f7cf29b
The removed patches were applied upstream. Remove the 300-mac80211-optimize-skb-resizing.patch. This patch was not applied upstream, but it conflicts with upstream changes and needs bigger changes. It was applied with Felix to remove this patch for now. It should be reworked and then send upstream later. 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
|
|
@@ -11472,6 +11472,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)
|
|
{
|
|
@@ -11520,15 +11529,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,
|