diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-14 14:29:43 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-22 19:29:47 +0200 |
commit | a4f9ba323b64e124f1b6a1ac05a14454bc84c096 (patch) | |
tree | ee641a8214dc31b47cec8d1fd61333488f2192df | |
parent | 9b97f3e420d3d691ecff27e25b843db34e111de3 (diff) | |
download | backports-a4f9ba323b64e124f1b6a1ac05a14454bc84c096.tar.gz |
patches: Refresh on kernel 5.10.68v5.10.68-1
No manual changes needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | patches/0012-driver-quirks/drivers_net_wireless_cw1200_sdio.patch | 2 | ||||
-rw-r--r-- | patches/0014-netlink_seq/net_wireless_nl80211.patch | 2 | ||||
-rw-r--r-- | patches/0075-ndo-stats-64/usbnet.patch | 2 | ||||
-rw-r--r-- | patches/0077-genl-ro-after-init/hwsim.patch | 2 | ||||
-rw-r--r-- | patches/0077-genl-ro-after-init/nl80211.patch | 2 | ||||
-rw-r--r-- | patches/0085-iwlwifi-pci-device-removal.patch | 4 | ||||
-rw-r--r-- | patches/0092-listified-rx/iwlwifi.patch | 2 | ||||
-rw-r--r-- | patches/0094-ndo-tx-timeout/usbnet.patch | 2 | ||||
-rw-r--r-- | patches/0097-skb-list/mac80211-rx.patch | 12 | ||||
-rw-r--r-- | patches/0100-revert-small_ops/mac80211.patch | 4 | ||||
-rw-r--r-- | patches/0100-revert-small_ops/mac80211_hwsim.patch | 4 |
11 files changed, 19 insertions, 19 deletions
diff --git a/patches/0012-driver-quirks/drivers_net_wireless_cw1200_sdio.patch b/patches/0012-driver-quirks/drivers_net_wireless_cw1200_sdio.patch index 7fa04588..4f592b92 100644 --- a/patches/0012-driver-quirks/drivers_net_wireless_cw1200_sdio.patch +++ b/patches/0012-driver-quirks/drivers_net_wireless_cw1200_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c +++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c -@@ -244,6 +244,12 @@ static size_t cw1200_sdio_align_size(str +@@ -245,6 +245,12 @@ static size_t cw1200_sdio_align_size(str else size = sdio_align_size(self->func, size); diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch index 586b5501..8b34d5e7 100644 --- a/patches/0014-netlink_seq/net_wireless_nl80211.patch +++ b/patches/0014-netlink_seq/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -9316,7 +9316,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -9315,7 +9315,9 @@ static int nl80211_dump_scan(struct sk_b if (start == 0) cfg80211_bss_expire(rdev); diff --git a/patches/0075-ndo-stats-64/usbnet.patch b/patches/0075-ndo-stats-64/usbnet.patch index 68cc0d65..8d60d3a9 100644 --- a/patches/0075-ndo-stats-64/usbnet.patch +++ b/patches/0075-ndo-stats-64/usbnet.patch @@ -12,7 +12,7 @@ { --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h -@@ -287,5 +287,9 @@ extern void usbnet_status_stop(struct us +@@ -289,5 +289,9 @@ extern void usbnet_status_stop(struct us extern void usbnet_update_max_qlen(struct usbnet *dev); extern void usbnet_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats); diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch index a877f147..e9ef9c92 100644 --- a/patches/0077-genl-ro-after-init/hwsim.patch +++ b/patches/0077-genl-ro-after-init/hwsim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -4001,7 +4001,7 @@ static const struct genl_small_ops hwsim +@@ -4034,7 +4034,7 @@ static const struct genl_small_ops hwsim }, }; diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch index 65cc153c..462b1bf3 100644 --- a/patches/0077-genl-ro-after-init/nl80211.patch +++ b/patches/0077-genl-ro-after-init/nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -15530,7 +15530,7 @@ static const struct genl_small_ops nl802 +@@ -15529,7 +15529,7 @@ static const struct genl_small_ops nl802 }, }; diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch index a4c6b73c..4ea9bfc9 100644 --- a/patches/0085-iwlwifi-pci-device-removal.patch +++ b/patches/0085-iwlwifi-pci-device-removal.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel index f74281508197..3b11bd68f261 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -2007,6 +2007,9 @@ static void iwl_trans_pcie_removal_wk(st +@@ -2010,6 +2010,9 @@ static void iwl_trans_pcie_removal_wk(st struct iwl_trans_pcie_removal *removal = container_of(wk, struct iwl_trans_pcie_removal, work); struct pci_dev *pdev = removal->pdev; @@ -12,7 +12,7 @@ index f74281508197..3b11bd68f261 100644 static char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -2015,6 +2018,7 @@ static void iwl_trans_pcie_removal_wk(st +@@ -2018,6 +2021,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); diff --git a/patches/0092-listified-rx/iwlwifi.patch b/patches/0092-listified-rx/iwlwifi.patch index 0772aa0d..44ab1d64 100644 --- a/patches/0092-listified-rx/iwlwifi.patch +++ b/patches/0092-listified-rx/iwlwifi.patch @@ -3,7 +3,7 @@ commit 323ebb61e32b ("net: use listified RX for handling GRO_NORMAL skbs") --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c -@@ -1603,11 +1603,13 @@ out: +@@ -1606,11 +1606,13 @@ out: if (napi->poll) { napi_gro_flush(napi, false); diff --git a/patches/0094-ndo-tx-timeout/usbnet.patch b/patches/0094-ndo-tx-timeout/usbnet.patch index 2d0ef695..42b8fac5 100644 --- a/patches/0094-ndo-tx-timeout/usbnet.patch +++ b/patches/0094-ndo-tx-timeout/usbnet.patch @@ -1,6 +1,6 @@ --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h -@@ -255,6 +255,7 @@ extern int usbnet_stop(struct net_device +@@ -257,6 +257,7 @@ extern int usbnet_stop(struct net_device extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb, struct net_device *net); extern void usbnet_tx_timeout(struct net_device *net, unsigned int txqueue); diff --git a/patches/0097-skb-list/mac80211-rx.patch b/patches/0097-skb-list/mac80211-rx.patch index dc76fc34..53b8f0bf 100644 --- a/patches/0097-skb-list/mac80211-rx.patch +++ b/patches/0097-skb-list/mac80211-rx.patch @@ -37,7 +37,7 @@ the older kernel instead. The list attributes where also backported to struct ieee80211_sub_if_data *sdata; --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2605,7 +2605,11 @@ static void ieee80211_deliver_skb_to_loc +@@ -2602,7 +2602,11 @@ static void ieee80211_deliver_skb_to_loc /* deliver to local stack */ if (rx->list) @@ -49,7 +49,7 @@ the older kernel instead. The list attributes where also backported to else netif_receive_skb(skb); } -@@ -4545,7 +4549,11 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4542,7 +4546,11 @@ static bool ieee80211_invoke_fast_rx(str skb->protocol = eth_type_trans(skb, fast_rx->dev); memset(skb->cb, 0, sizeof(skb->cb)); if (rx->list) @@ -61,7 +61,7 @@ the older kernel instead. The list attributes where also backported to else netif_receive_skb(skb); -@@ -4612,7 +4620,11 @@ static bool ieee80211_prepare_and_rx_han +@@ -4609,7 +4617,11 @@ static bool ieee80211_prepare_and_rx_han static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, struct sk_buff *skb, @@ -73,7 +73,7 @@ the older kernel instead. The list attributes where also backported to { struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_sub_if_data *sdata; -@@ -4737,7 +4749,11 @@ static void __ieee80211_rx_handle_packet +@@ -4734,7 +4746,11 @@ static void __ieee80211_rx_handle_packet * 802.11 MPDU is received from the hardware. */ void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, @@ -85,7 +85,7 @@ the older kernel instead. The list attributes where also backported to { struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_rate *rate = NULL; -@@ -4854,7 +4870,13 @@ void ieee80211_rx_napi(struct ieee80211_ +@@ -4851,7 +4867,13 @@ void ieee80211_rx_napi(struct ieee80211_ struct sk_buff *skb, struct napi_struct *napi) { struct sk_buff *tmp; @@ -99,7 +99,7 @@ the older kernel instead. The list attributes where also backported to /* -@@ -4871,8 +4893,13 @@ void ieee80211_rx_napi(struct ieee80211_ +@@ -4868,8 +4890,13 @@ void ieee80211_rx_napi(struct ieee80211_ return; } diff --git a/patches/0100-revert-small_ops/mac80211.patch b/patches/0100-revert-small_ops/mac80211.patch index f994ab94..3335a130 100644 --- a/patches/0100-revert-small_ops/mac80211.patch +++ b/patches/0100-revert-small_ops/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -14695,9 +14695,11 @@ static const struct genl_ops nl80211_ops +@@ -14694,9 +14694,11 @@ static const struct genl_ops nl80211_ops .internal_flags = NL80211_FLAG_NEED_WIPHY | NL80211_FLAG_NEED_RTNL, }, @@ -12,7 +12,7 @@ { .cmd = NL80211_CMD_SET_WIPHY, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, -@@ -15559,8 +15561,10 @@ static struct genl_family nl80211_fam __ +@@ -15558,8 +15560,10 @@ static struct genl_family nl80211_fam __ .module = THIS_MODULE, .ops = nl80211_ops, .n_ops = ARRAY_SIZE(nl80211_ops), diff --git a/patches/0100-revert-small_ops/mac80211_hwsim.patch b/patches/0100-revert-small_ops/mac80211_hwsim.patch index 1a764336..42e52308 100644 --- a/patches/0100-revert-small_ops/mac80211_hwsim.patch +++ b/patches/0100-revert-small_ops/mac80211_hwsim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -3964,7 +3964,11 @@ done: +@@ -3997,7 +3997,11 @@ done: } /* Generic Netlink operations array */ @@ -12,7 +12,7 @@ { .cmd = HWSIM_CMD_REGISTER, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, -@@ -4008,8 +4012,13 @@ static struct genl_family hwsim_genl_fam +@@ -4041,8 +4045,13 @@ static struct genl_family hwsim_genl_fam .policy = hwsim_genl_policy, .netnsok = true, .module = THIS_MODULE, |