* [PATCH 00/14] backports: multiple fixes and Realtek drivers
@ 2018-03-04 22:57 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens
` (14 more replies)
0 siblings, 15 replies; 17+ messages in thread
From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw)
To: backports; +Cc: johannes, Hauke Mehrtens
This fixes multiple smaller problems I found when using kernel 4.16-rc3
as a base. I am still getting many liker problems at the end, see this
result:
1 3.10.108 [ LINK ]
2 3.11.10 [ LINK ]
3 3.12.74 [ OK ]
4 3.13.11 [ LINK ]
5 3.14.79 [ LINK ]
6 3.15.10 [ LINK ]
7 3.16.54 [ OK ]
8 3.17.8 [ LINK ]
9 3.18.97 [ OK ]
10 3.19.8 [ LINK ]
11 4.0.9 [ LINK ]
12 4.1.48 [ OK ]
13 4.2.8 [ LINK ]
14 4.3.6 [ LINK ]
15 4.4.119 [ OK ]
16 4.5.7 [ OK ]
17 4.6.7 [ OK ]
18 4.7.10 [ OK ]
19 4.8.17 [ OK ]
20 4.9.85 [ OK ]
21 4.10.17 [ OK ]
22 4.11.12 [ OK ]
23 4.12.14 [ OK ]
24 4.13.16 [ OK ]
25 4.14.23 [ OK ]
26 4.15.7 [ FAIL ]
This also adds some new Realtek stating wifi drivers, I would like to
use them in OpenWrt.
Hauke Mehrtens (14):
patches: refresh on kernel v4.16-rc3
compat: timer.h: Remove last parameters from DEFINE_TIMER
patches: Use old parameter type for DEFINE_TIMER
backport: poll.h: add include linux/eventpoll.h
header: types.h: add __poll_t
header: kernel.h: include bug.h
header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE
header: nospec.h: provide dummy header file
header: timekeeping.h: Add ktime_get_real_seconds()
header: timekeeping.h: Add ktime_get_ts64()
header: netdevice.h: Fix netdev_upper_dev_link on 4.14
header: inet_frag.h: Use old version of in sub_frag_mem_limit() for
kernel 3.16
dependencies: Make mt76 depend on kernel 4.1
backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver
backport/Kconfig.sources | 2 +
backport/Makefile.kernel | 2 +
backport/backport-include/linux/debugfs.h | 7 ++++
backport/backport-include/linux/eventpoll.h | 49 ++++++++++++++++++++++
backport/backport-include/linux/kernel.h | 1 +
backport/backport-include/linux/netdevice.h | 2 +-
backport/backport-include/linux/nospec.h | 12 ++++++
backport/backport-include/linux/poll.h | 1 +
backport/backport-include/linux/timekeeping.h | 16 +++++++
backport/backport-include/linux/timer.h | 7 ++++
backport/backport-include/linux/types.h | 4 ++
backport/backport-include/net/inet_frag.h | 2 +-
copy-list | 6 +++
dependencies | 8 ++++
.../0002-disable-dump-adjust-on-old-kernels.patch | 4 +-
.../include_net_cfg80211.patch | 2 +-
patches/0004-disable-wext-kconfig.patch | 2 +-
patches/0005-disable-usb-net-asix.patch | 2 +-
.../net_wireless_core.patch | 4 +-
.../0014-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../0018-pv-trace-fixes/net_mac80211_trace.patch | 8 ++--
patches/0024-led-blink-api/mac80211.patch | 2 +-
patches/0025-usb-sg/usbnet.patch | 12 +++---
patches/0028-select_queue/mac80211.patch | 4 +-
patches/0028-select_queue/mwifiex.patch | 2 +-
patches/0053-possible_net_t.patch | 2 +-
patches/0055-name_assign_type/brcmfmac.patch | 2 +-
patches/0069-iwlwifi-pd-string-fix.patch | 6 +--
patches/0070-mac80211-fils.patch | 2 +-
patches/0071-skb-head_frag/wireless.patch | 2 +-
patches/0075-ndo-stats-64/usbnet.patch | 4 +-
patches/0077-genl-ro-after-init/hwsim.patch | 2 +-
patches/0077-genl-ro-after-init/nl80211.patch | 2 +-
patches/0079-netdev-destructor/brcmfmac.patch | 4 +-
patches/0083-timer_list.patch | 22 ++++++++++
patches/0084-disbale-some-staging-dirs.patch | 13 ++++++
patches/0085-not-include-kmemleak.patch | 11 +++++
patches/0086-rtl8723bs-no-extern-inline.patch | 26 ++++++++++++
patches/devcoredump.patch | 18 ++++----
patches/lib-bucket_locks.patch | 2 +-
patches/lib-refcount.patch | 2 +-
patches/lib-rhashtable.patch | 2 +-
patches/verify.patch | 8 ++--
43 files changed, 240 insertions(+), 53 deletions(-)
create mode 100644 backport/backport-include/linux/eventpoll.h
create mode 100644 backport/backport-include/linux/nospec.h
create mode 100644 patches/0083-timer_list.patch
create mode 100644 patches/0084-disbale-some-staging-dirs.patch
create mode 100644 patches/0085-not-include-kmemleak.patch
create mode 100644 patches/0086-rtl8723bs-no-extern-inline.patch
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 01/14] patches: refresh on kernel v4.16-rc3 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER Hauke Mehrtens ` (13 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens No manual changes needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/0002-disable-dump-adjust-on-old-kernels.patch | 4 ++-- .../include_net_cfg80211.patch | 2 +- patches/0004-disable-wext-kconfig.patch | 2 +- patches/0005-disable-usb-net-asix.patch | 2 +- .../net_wireless_core.patch | 4 ++-- patches/0014-netlink_seq/net_wireless_nl80211.patch | 2 +- patches/0018-pv-trace-fixes/net_mac80211_trace.patch | 8 ++++---- patches/0024-led-blink-api/mac80211.patch | 2 +- patches/0025-usb-sg/usbnet.patch | 12 ++++++------ patches/0028-select_queue/mac80211.patch | 4 ++-- patches/0028-select_queue/mwifiex.patch | 2 +- patches/0053-possible_net_t.patch | 2 +- patches/0055-name_assign_type/brcmfmac.patch | 2 +- patches/0069-iwlwifi-pd-string-fix.patch | 6 +++--- patches/0070-mac80211-fils.patch | 2 +- patches/0071-skb-head_frag/wireless.patch | 2 +- patches/0075-ndo-stats-64/usbnet.patch | 4 ++-- patches/0077-genl-ro-after-init/hwsim.patch | 2 +- patches/0077-genl-ro-after-init/nl80211.patch | 2 +- patches/0079-netdev-destructor/brcmfmac.patch | 4 ++-- patches/devcoredump.patch | 18 +++++++++--------- patches/lib-bucket_locks.patch | 2 +- patches/lib-refcount.patch | 2 +- patches/lib-rhashtable.patch | 2 +- patches/verify.patch | 8 ++++---- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch index e6cc9878..332a7b61 100644 --- a/patches/0002-disable-dump-adjust-on-old-kernels.patch +++ b/patches/0002-disable-dump-adjust-on-old-kernels.patch @@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1977,6 +1977,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -2010,6 +2010,7 @@ static int nl80211_dump_wiphy(struct sk_ cb->nlh->nlmsg_seq, NLM_F_MULTI, state); if (ret < 0) { @@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -1998,6 +1999,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -2031,6 +2032,7 @@ static int nl80211_dump_wiphy(struct sk_ rtnl_unlock(); return 1; } diff --git a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch index e126484b..9727bb73 100644 --- a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch +++ b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -3709,6 +3709,9 @@ struct wiphy_iftype_ext_capab { +@@ -3723,6 +3723,9 @@ struct wiphy_iftype_ext_capab { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/0004-disable-wext-kconfig.patch b/patches/0004-disable-wext-kconfig.patch index 2ebd3667..313ea906 100644 --- a/patches/0004-disable-wext-kconfig.patch +++ b/patches/0004-disable-wext-kconfig.patch @@ -25,7 +25,7 @@ so remove the Kconfig options for them. config CFG80211 tristate "cfg80211 - wireless configuration API" depends on RFKILL || !RFKILL -@@ -174,7 +156,7 @@ config CFG80211_CRDA_SUPPORT +@@ -191,7 +173,7 @@ config CFG80211_CRDA_SUPPORT config CFG80211_WEXT bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT depends on CFG80211 diff --git a/patches/0005-disable-usb-net-asix.patch b/patches/0005-disable-usb-net-asix.patch index 23de21e1..5786e633 100644 --- a/patches/0005-disable-usb-net-asix.patch +++ b/patches/0005-disable-usb-net-asix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile -@@ -10,7 +10,6 @@ obj-$(CONFIG_USB_RTL8152) += r8152.o +@@ -11,7 +11,6 @@ obj-$(CONFIG_USB_RTL8152) += r8152.o obj-$(CONFIG_USB_HSO) += hso.o obj-$(CONFIG_USB_LAN78XX) += lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) += asix.o diff --git a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch index db8cbe68..5a7364a1 100644 --- a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch +++ b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -472,10 +472,6 @@ use_default_name: +@@ -478,10 +478,6 @@ use_default_name: INIT_WORK(&rdev->mlme_unreg_wk, cfg80211_mlme_unreg_wk); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); @@ -11,7 +11,7 @@ device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -1182,6 +1178,15 @@ static int cfg80211_netdev_notifier_call +@@ -1188,6 +1184,15 @@ static int cfg80211_netdev_notifier_call } wdev->netdev = dev; #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch index 053aadee..e56b92f1 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 -@@ -7816,7 +7816,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -7916,7 +7916,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/0018-pv-trace-fixes/net_mac80211_trace.patch b/patches/0018-pv-trace-fixes/net_mac80211_trace.patch index b8fee1a8..8b3f7afd 100644 --- a/patches/0018-pv-trace-fixes/net_mac80211_trace.patch +++ b/patches/0018-pv-trace-fixes/net_mac80211_trace.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/trace.c +++ b/net/mac80211/trace.c -@@ -16,12 +16,16 @@ void __sdata_info(const char *fmt, ...) +@@ -17,12 +17,16 @@ void __sdata_info(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -19,7 +19,7 @@ trace_mac80211_info(&vaf); va_end(args); } -@@ -34,10 +38,16 @@ void __sdata_dbg(bool print, const char +@@ -35,10 +39,16 @@ void __sdata_dbg(bool print, const char va_list args; va_start(args, fmt); @@ -38,7 +38,7 @@ trace_mac80211_dbg(&vaf); va_end(args); } -@@ -47,12 +57,16 @@ void __sdata_err(const char *fmt, ...) +@@ -48,12 +58,16 @@ void __sdata_err(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -57,7 +57,7 @@ trace_mac80211_err(&vaf); va_end(args); } -@@ -65,10 +79,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo +@@ -66,10 +80,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo va_list args; va_start(args, fmt); diff --git a/patches/0024-led-blink-api/mac80211.patch b/patches/0024-led-blink-api/mac80211.patch index 351c8ab5..61e0e893 100644 --- a/patches/0024-led-blink-api/mac80211.patch +++ b/patches/0024-led-blink-api/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1280,6 +1280,7 @@ struct ieee80211_local { +@@ -1281,6 +1281,7 @@ struct ieee80211_local { struct mutex chanctx_mtx; #ifdef CONFIG_MAC80211_LEDS diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index 5b6fc25d..0b715780 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1310,6 +1310,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1311,6 +1311,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1342,6 +1343,12 @@ static int build_dma_sg(const struct sk_ +@@ -1343,6 +1344,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1398,12 +1405,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1399,12 +1406,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1470,7 +1484,9 @@ not_drop: +@@ -1471,7 +1485,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1523,7 +1539,9 @@ static void usbnet_bh (unsigned long par +@@ -1524,7 +1540,9 @@ static void usbnet_bh (struct timer_list rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ case rx_cleanup: usb_free_urb (entry->urb); dev_kfree_skb (skb); -@@ -1892,7 +1910,9 @@ int usbnet_resume (struct usb_interface +@@ -1891,7 +1909,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); diff --git a/patches/0028-select_queue/mac80211.patch b/patches/0028-select_queue/mac80211.patch index e7f2dc1d..2bfca8ee 100644 --- a/patches/0028-select_queue/mac80211.patch +++ b/patches/0028-select_queue/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1145,10 +1145,20 @@ static void ieee80211_uninit(struct net_ +@@ -1126,10 +1126,20 @@ static void ieee80211_uninit(struct net_ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } @@ -21,7 +21,7 @@ { return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } -@@ -1191,10 +1201,20 @@ static const struct net_device_ops ieee8 +@@ -1172,10 +1182,20 @@ static const struct net_device_ops ieee8 .ndo_get_stats64 = ieee80211_get_stats64, }; diff --git a/patches/0028-select_queue/mwifiex.patch b/patches/0028-select_queue/mwifiex.patch index 6b76a29a..5d2e257c 100644 --- a/patches/0028-select_queue/mwifiex.patch +++ b/patches/0028-select_queue/mwifiex.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c -@@ -1257,9 +1257,19 @@ static struct net_device_stats *mwifiex_ +@@ -1261,9 +1261,19 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch index c3b03ee2..3eb62bc0 100644 --- a/patches/0053-possible_net_t.patch +++ b/patches/0053-possible_net_t.patch @@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 04e5785..a251da1 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -3847,12 +3847,12 @@ struct wiphy { +@@ -3861,12 +3861,12 @@ struct wiphy { static inline struct net *wiphy_net(struct wiphy *wiphy) { diff --git a/patches/0055-name_assign_type/brcmfmac.patch b/patches/0055-name_assign_type/brcmfmac.patch index 7244739c..6049dab9 100644 --- a/patches/0055-name_assign_type/brcmfmac.patch +++ b/patches/0055-name_assign_type/brcmfmac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c -@@ -2204,7 +2204,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s +@@ -2198,7 +2198,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s } strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1); diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch index 89f7f551..272b8704 100644 --- a/patches/0069-iwlwifi-pd-string-fix.patch +++ b/patches/0069-iwlwifi-pd-string-fix.patch @@ -26,7 +26,7 @@ goto err; --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c -@@ -1573,8 +1573,13 @@ void iwl_mvm_vif_dbgfs_register(struct i +@@ -1498,8 +1498,13 @@ void iwl_mvm_vif_dbgfs_register(struct i mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); if (!mvmvif->dbgfs_dir) { @@ -40,7 +40,7 @@ return; } -@@ -1629,15 +1634,28 @@ void iwl_mvm_vif_dbgfs_register(struct i +@@ -1553,15 +1558,28 @@ void iwl_mvm_vif_dbgfs_register(struct i * find * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/ */ @@ -71,7 +71,7 @@ IWL_ERR(mvm, "Can't create debugfs entity\n"); --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c -@@ -1929,7 +1929,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv +@@ -2032,7 +2032,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv * Create a symlink with mac80211. It will be removed when mac80211 * exists (before the opmode exists which removes the target.) */ diff --git a/patches/0070-mac80211-fils.patch b/patches/0070-mac80211-fils.patch index 44683792..345e7074 100644 --- a/patches/0070-mac80211-fils.patch +++ b/patches/0070-mac80211-fils.patch @@ -42,7 +42,7 @@ #endif /* FILS_AEAD_H */ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -550,7 +550,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_ +@@ -553,7 +553,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_ NL80211_FEATURE_MAC_ON_CREATE | NL80211_FEATURE_USERSPACE_MPM | NL80211_FEATURE_FULL_AP_CLIENT_STATE; diff --git a/patches/0071-skb-head_frag/wireless.patch b/patches/0071-skb-head_frag/wireless.patch index 725cafa5..91a345fd 100644 --- a/patches/0071-skb-head_frag/wireless.patch +++ b/patches/0071-skb-head_frag/wireless.patch @@ -1,6 +1,6 @@ --- a/net/wireless/util.c +++ b/net/wireless/util.c -@@ -748,7 +748,11 @@ void ieee80211_amsdu_to_8023s(struct sk_ +@@ -632,7 +632,11 @@ void ieee80211_amsdu_to_8023s(struct sk_ u8 *payload; int offset = 0, remaining; struct ethhdr eth; diff --git a/patches/0075-ndo-stats-64/usbnet.patch b/patches/0075-ndo-stats-64/usbnet.patch index 7b48bfeb..8370b660 100644 --- a/patches/0075-ndo-stats-64/usbnet.patch +++ b/patches/0075-ndo-stats-64/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1014,6 +1014,9 @@ void usbnet_get_stats64(struct net_devic +@@ -1015,6 +1015,9 @@ void usbnet_get_stats64(struct net_devic } } EXPORT_SYMBOL_GPL(usbnet_get_stats64); @@ -12,7 +12,7 @@ { --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h -@@ -283,5 +283,9 @@ extern void usbnet_status_stop(struct us +@@ -285,5 +285,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 0e7ccb14..f7f607e9 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 -@@ -3309,7 +3309,7 @@ static const struct genl_ops hwsim_ops[] +@@ -3376,7 +3376,7 @@ static const struct genl_ops hwsim_ops[] }, }; diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch index 353679bc..fb04fd41 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 -@@ -13247,7 +13247,7 @@ static const struct genl_ops nl80211_ops +@@ -13365,7 +13365,7 @@ static const struct genl_ops nl80211_ops }; diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch index 6dae7a7a..298c4417 100644 --- a/patches/0079-netdev-destructor/brcmfmac.patch +++ b/patches/0079-netdev-destructor/brcmfmac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -462,6 +462,23 @@ static const struct net_device_ops brcmf +@@ -500,6 +500,23 @@ static const struct net_device_ops brcmf .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; @@ -24,7 +24,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) { struct brcmf_pub *drvr = ifp->drvr; -@@ -634,7 +651,11 @@ struct brcmf_if *brcmf_add_if(struct brc +@@ -672,7 +689,11 @@ struct brcmf_if *brcmf_add_if(struct brc if (!ndev) return ERR_PTR(-ENOMEM); diff --git a/patches/devcoredump.patch b/patches/devcoredump.patch index feeadc4f..1dbec579 100644 --- a/patches/devcoredump.patch +++ b/patches/devcoredump.patch @@ -1,6 +1,6 @@ --- a/compat/drivers-base-devcoredump.c +++ b/compat/drivers-base-devcoredump.c -@@ -31,6 +31,7 @@ +@@ -16,6 +16,7 @@ #include <linux/slab.h> #include <linux/fs.h> #include <linux/workqueue.h> @@ -8,7 +8,7 @@ static struct class devcd_class; -@@ -40,6 +41,10 @@ static bool devcd_disabled; +@@ -25,6 +26,10 @@ static bool devcd_disabled; /* if data isn't read by userspace after 5 minutes then delete it */ #define DEVCD_TIMEOUT (HZ * 60 * 5) @@ -19,7 +19,7 @@ struct devcd_entry { struct device devcd_dev; void *data; -@@ -69,8 +74,7 @@ static void devcd_dev_release(struct dev +@@ -54,8 +59,7 @@ static void devcd_dev_release(struct dev * a struct device to know when it goes away? */ if (devcd->failing_dev->kobj.sd) @@ -29,7 +29,7 @@ put_device(devcd->failing_dev); kfree(devcd); -@@ -82,6 +86,9 @@ static void devcd_del(struct work_struct +@@ -67,6 +71,9 @@ static void devcd_del(struct work_struct devcd = container_of(wk, struct devcd_entry, del_wk.work); @@ -39,7 +39,7 @@ device_del(&devcd->devcd_dev); put_device(&devcd->devcd_dev); } -@@ -115,6 +122,7 @@ static struct bin_attribute devcd_attr_d +@@ -100,6 +107,7 @@ static struct bin_attribute devcd_attr_d .write = devcd_data_write, }; @@ -47,7 +47,7 @@ static struct bin_attribute *devcd_dev_bin_attrs[] = { &devcd_attr_data, NULL, }; -@@ -126,6 +134,7 @@ static const struct attribute_group devc +@@ -111,6 +119,7 @@ static const struct attribute_group devc static const struct attribute_group *devcd_dev_groups[] = { &devcd_dev_group, NULL, }; @@ -55,7 +55,7 @@ static int devcd_free(struct device *dev, void *data) { -@@ -172,7 +181,9 @@ static struct class devcd_class = { +@@ -157,7 +166,9 @@ static struct class devcd_class = { .name = "devcoredump", .owner = THIS_MODULE, .dev_release = devcd_dev_release, @@ -65,7 +65,7 @@ .class_groups = devcd_class_groups, }; -@@ -316,6 +327,11 @@ void dev_coredumpm(struct device *dev, s +@@ -301,6 +312,11 @@ void dev_coredumpm(struct device *dev, s if (device_add(&devcd->devcd_dev)) goto put_device; @@ -77,7 +77,7 @@ if (sysfs_create_link(&devcd->devcd_dev.kobj, &dev->kobj, "failing_device")) /* nothing - symlink will be missing */; -@@ -358,15 +374,13 @@ void dev_coredumpsg(struct device *dev, +@@ -343,15 +359,13 @@ void dev_coredumpsg(struct device *dev, } EXPORT_SYMBOL_GPL(dev_coredumpsg); diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch index df7420de..15eeda11 100644 --- a/patches/lib-bucket_locks.patch +++ b/patches/lib-bucket_locks.patch @@ -2,7 +2,7 @@ diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c index 266a97c5708b..405b52ca5708 100644 --- a/compat/lib-bucket_locks.c +++ b/compat/lib-bucket_locks.c -@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *locks_mask, +@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t ** } if (sizeof(spinlock_t) != 0) { diff --git a/patches/lib-refcount.patch b/patches/lib-refcount.patch index dc884f06..aa9ff468 100644 --- a/patches/lib-refcount.patch +++ b/patches/lib-refcount.patch @@ -2,7 +2,7 @@ diff --git a/compat/lib-refcount.c b/compat/lib-refcount.c index 5d0582a..8d108f9 100644 --- a/compat/lib-refcount.c +++ b/compat/lib-refcount.c -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include <linux/refcount.h> #include <linux/bug.h> diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch index d29169f4..2e91f8d9 100644 --- a/patches/lib-rhashtable.patch +++ b/patches/lib-rhashtable.patch @@ -1,7 +1,7 @@ --- a/compat/lib-rhashtable.c +++ b/compat/lib-rhashtable.c -@@ -211,10 +226,11 @@ static struct bucket_table *bucket_table +@@ -175,10 +175,11 @@ static struct bucket_table *bucket_table int i; size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]); diff --git a/patches/verify.patch b/patches/verify.patch index 442f2f62..791de881 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -1,6 +1,6 @@ --- a/compat/verification/pkcs7_trust.c +++ b/compat/verification/pkcs7_trust.c -@@ -115,7 +115,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, +@@ -116,7 +116,7 @@ static int pkcs7_validate_trust_one(stru return -ENOKEY; matched: @@ -23,7 +23,7 @@ #include "x509_parser.h" /* -@@ -159,6 +156,7 @@ not_self_signed: +@@ -155,6 +152,7 @@ not_self_signed: return 0; } @@ -31,9 +31,9 @@ /* * Attempt to parse a data blob for a key as an X509 certificate. */ -@@ -276,3 +274,4 @@ module_exit(x509_key_exit); - +@@ -273,3 +271,4 @@ module_exit(x509_key_exit); MODULE_DESCRIPTION("X.509 certificate parser"); + MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); +#endif --- a/include/crypto/pkcs7.h -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Hauke Mehrtens ` (12 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens DEFINE_TIMER only has 2 parameters since kernel commit 1d27e3e2252ba ("timer: Remove expires and data arguments from DEFINE_TIMER") which was added with kernel 4.15. Add a version which translates between the new and the old API. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/timer.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backport/backport-include/linux/timer.h b/backport/backport-include/linux/timer.h index 9824ea6b..69590bb7 100644 --- a/backport/backport-include/linux/timer.h +++ b/backport/backport-include/linux/timer.h @@ -60,4 +60,11 @@ static inline void timer_setup(struct timer_list *timer, container_of(callback_timer, typeof(*var), timer_fieldname) #endif +#if LINUX_VERSION_IS_LESS(4,15,0) +#undef DEFINE_TIMER +#define DEFINE_TIMER(_name, _function) \ + struct timer_list _name = \ + __TIMER_INITIALIZER(_function, 0, 0, 0) +#endif + #endif /* _BACKPORT_TIMER_H */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-21 7:59 ` Johannes Berg 2018-03-04 22:57 ` [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Hauke Mehrtens ` (11 subsequent siblings) 14 siblings, 1 reply; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens Use the unsigned long parameters on kernel versions < 4.15 for the DEFINE_TIMER callback. This was changed in Linux mainline commit 24ed960abf1d ("treewide: Switch DEFINE_TIMER callbacks to struct timer_list *") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/0083-timer_list.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/0083-timer_list.patch diff --git a/patches/0083-timer_list.patch b/patches/0083-timer_list.patch new file mode 100644 index 00000000..dca3b948 --- /dev/null +++ b/patches/0083-timer_list.patch @@ -0,0 +1,22 @@ +--- a/drivers/net/wireless/atmel/at76c50x-usb.c ++++ b/drivers/net/wireless/atmel/at76c50x-usb.c +@@ -518,11 +518,19 @@ exit: + + /* LED trigger */ + static int tx_activity; ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data); ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused); ++#endif + static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc); + DEFINE_LED_TRIGGER(ledtrig_tx); + ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data) ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused) ++#endif + { + static int tx_lastactivity; + -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER 2018-03-04 22:57 ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Hauke Mehrtens @ 2018-03-21 7:59 ` Johannes Berg 0 siblings, 0 replies; 17+ messages in thread From: Johannes Berg @ 2018-03-21 7:59 UTC (permalink / raw) To: Hauke Mehrtens, backports On Sun, 2018-03-04 at 23:57 +0100, Hauke Mehrtens wrote: > Use the unsigned long parameters on kernel versions < 4.15 for the > DEFINE_TIMER callback. This was changed in Linux mainline commit > 24ed960abf1d ("treewide: Switch DEFINE_TIMER callbacks to struct > timer_list *") But before this, we had a macro that could deal with both ways - why can't we backport using a similar macro, rather than doing a patch? If we have static void at76_ledtrig_tx_timerfunc(struct timer_list *unused); then we should be able to #define DEFINE_TIMER(x, y) ... (cast)(y) or something, no? johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (2 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 05/14] header: types.h: add __poll_t Hauke Mehrtens ` (10 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens The POLL constants are getting replaced with the EPOLL constants. In this process commit e78cd95bebd9 ("preparation to switching ->poll() to returning EPOLL...") added an additional include to linux/poll.h. Some drivers make use of this indirect include now and fail to compile without it. Older kernel versions do not define all the EPON constants so add them if they are not available. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/eventpoll.h | 49 +++++++++++++++++++++++++++++ backport/backport-include/linux/poll.h | 1 + 2 files changed, 50 insertions(+) create mode 100644 backport/backport-include/linux/eventpoll.h diff --git a/backport/backport-include/linux/eventpoll.h b/backport/backport-include/linux/eventpoll.h new file mode 100644 index 00000000..7cc87aa0 --- /dev/null +++ b/backport/backport-include/linux/eventpoll.h @@ -0,0 +1,49 @@ +#ifndef __BACKPORT_LINUX_EVENTPOLL_H +#define __BACKPORT_LINUX_EVENTPOLL_H +#include_next <linux/eventpoll.h> + +#ifndef EPOLLIN +#define EPOLLIN 0x00000001 +#endif + +#ifndef EPOLLPRI +#define EPOLLPRI 0x00000002 +#endif + +#ifndef EPOLLOUT +#define EPOLLOUT 0x00000004 +#endif + +#ifndef EPOLLERR +#define EPOLLERR 0x00000008 +#endif + +#ifndef EPOLLHUP +#define EPOLLHUP 0x00000010 +#endif + +#ifndef EPOLLRDNORM +#define EPOLLRDNORM 0x00000040 +#endif + +#ifndef EPOLLRDBAND +#define EPOLLRDBAND 0x00000080 +#endif + +#ifndef EPOLLWRNORM +#define EPOLLWRNORM 0x00000100 +#endif + +#ifndef EPOLLWRBAND +#define EPOLLWRBAND 0x00000200 +#endif + +#ifndef EPOLLMSG +#define EPOLLMSG 0x00000400 +#endif + +#ifndef EPOLLRDHUP +#define EPOLLRDHUP 0x00002000 +#endif + +#endif /* __BACKPORT_LINUX_EVENTPOLL_H */ diff --git a/backport/backport-include/linux/poll.h b/backport/backport-include/linux/poll.h index 3eecd81f..aea64048 100644 --- a/backport/backport-include/linux/poll.h +++ b/backport/backport-include/linux/poll.h @@ -2,6 +2,7 @@ #define __BACKPORT_LINUX_POLL_H #include_next <linux/poll.h> #include <linux/version.h> +#include <linux/eventpoll.h> #if LINUX_VERSION_IS_LESS(3,4,0) #define poll_does_not_wait LINUX_BACKPORT(poll_does_not_wait) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 05/14] header: types.h: add __poll_t 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (3 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 06/14] header: kernel.h: include bug.h Hauke Mehrtens ` (9 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens __poll_t was added for kernel 4.15 in commit 8ced390c2b ("define __poll_t, annotate constants"), add it here for older kernel versions. Multiple drivers are using this type. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/backport-include/linux/types.h b/backport/backport-include/linux/types.h index 160570b4..0671e140 100644 --- a/backport/backport-include/linux/types.h +++ b/backport/backport-include/linux/types.h @@ -7,4 +7,8 @@ typedef __s64 time64_t; #endif +#if LINUX_VERSION_IS_LESS(4,16,0) +typedef unsigned __poll_t; +#endif + #endif /* __BACKPORT_TYPES */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 06/14] header: kernel.h: include bug.h 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (4 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 05/14] header: types.h: add __poll_t Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE Hauke Mehrtens ` (8 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens This prevents some compile problems in rtlwifi. Without this patch I am getting a compile error in drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c with multiple kernel versions because BUILD_BUG_ON_ZERO is implicitly defined. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/kernel.h | 1 + 1 file changed, 1 insertion(+) diff --git a/backport/backport-include/linux/kernel.h b/backport/backport-include/linux/kernel.h index 3ddeb13c..f5081663 100644 --- a/backport/backport-include/linux/kernel.h +++ b/backport/backport-include/linux/kernel.h @@ -1,6 +1,7 @@ #ifndef __BACKPORT_KERNEL_H #define __BACKPORT_KERNEL_H #include_next <linux/kernel.h> +#include <linux/bug.h> #include <linux/version.h> /* * some older kernels don't have this and thus don't -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (5 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 06/14] header: kernel.h: include bug.h Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 08/14] header: nospec.h: provide dummy header file Hauke Mehrtens ` (7 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens DEFINE_DEBUGFS_ATTRIBUTE and debugfs_create_file_unsafe() were introduced in mainline commit c6468808149 ("debugfs: add support for self-protecting attribute file fops"), but on older kernel versions where we do not have this extra security in debugfs we can use the older functions instead. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/debugfs.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backport/backport-include/linux/debugfs.h b/backport/backport-include/linux/debugfs.h index 11670388..fb50c4f5 100644 --- a/backport/backport-include/linux/debugfs.h +++ b/backport/backport-include/linux/debugfs.h @@ -53,4 +53,11 @@ debugfs_real_fops(const struct file *filp) } #endif /* <4.9.0 but not >= 4.8.4, 4.7.10 */ +#ifndef DEFINE_DEBUGFS_ATTRIBUTE +#define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \ + DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt) +#define debugfs_create_file_unsafe(name, mode, parent, data, fops) \ + debugfs_create_file(name, mode, parent, data, fops) +#endif + #endif /* __BACKPORT_DEBUGFS_H_ */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 08/14] header: nospec.h: provide dummy header file 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (6 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() Hauke Mehrtens ` (6 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens Older kernel versions do not have the include linux/nospec.h with the function array_index_nospec, provide a dummy implementation for these kernel versions and forward the call the the real version for capable kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/nospec.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 backport/backport-include/linux/nospec.h diff --git a/backport/backport-include/linux/nospec.h b/backport/backport-include/linux/nospec.h new file mode 100644 index 00000000..50cf4673 --- /dev/null +++ b/backport/backport-include/linux/nospec.h @@ -0,0 +1,12 @@ +#ifndef _BACKPORT_LINUX_NOSPEC_H +#define _BACKPORT_LINUX_NOSPEC_H + +#if LINUX_VERSION_IS_GEQ(4,14,18) || \ + LINUX_VERSION_IN_RANGE(4,9,81, 4,10,0) || \ + LINUX_VERSION_IN_RANGE(4,4,118, 4,5,0) +#include_next <linux/nospec.h> +#else +#define array_index_nospec(index, size) (index) +#endif + +#endif /* _BACKPORT_LINUX_NOSPEC_H */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (7 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 08/14] header: nospec.h: provide dummy header file Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() Hauke Mehrtens ` (5 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens This function was added in commit dbe7aa622db96b ("timekeeping: Provide y2038 safe accessor to the seconds portion of CLOCK_REALTIME") and is used by multiple realtek drivers. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/timekeeping.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h index 0b9c649a..c108645f 100644 --- a/backport/backport-include/linux/timekeeping.h +++ b/backport/backport-include/linux/timekeeping.h @@ -33,6 +33,15 @@ static inline time64_t ktime_get_seconds(void) return t.tv_sec; } + +static inline time64_t ktime_get_real_seconds(void) +{ + struct timeval tv; + + do_gettimeofday(&tv); + + return tv.tv_sec; +} #endif #endif /* __BACKPORT_TIMEKEEPING_H */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (8 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 Hauke Mehrtens ` (4 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens This function was added in commit d6d29896c665d ("timekeeping: Provide timespec64 based interfaces"). We can just use the 32 bit version instated as the rest was already backported in backports commit ea8b7cd797ca0c ("backports: deal with struct timespec64 changes)". Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/timekeeping.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h index c108645f..30f9b7a9 100644 --- a/backport/backport-include/linux/timekeeping.h +++ b/backport/backport-include/linux/timekeeping.h @@ -44,4 +44,11 @@ static inline time64_t ktime_get_real_seconds(void) } #endif +#if LINUX_VERSION_IS_LESS(3,17,0) +static inline void ktime_get_ts64(struct timespec64 *ts) +{ + ktime_get_ts(ts); +} +#endif + #endif /* __BACKPORT_TIMEKEEPING_H */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (9 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 Hauke Mehrtens ` (3 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens Commit 42ab19ee90292 ("net: Add extack to upper device linking") which added an extra parameter to netdev_upper_dev_link() was added with kernel 4.15 and was not backported to kernel 4.14, activate this backport already for kernel 4.14. Fixes: 8cdd85766293 ("backports: add netdev_upper_dev_link() extack argument") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index d92c95ad..8723f8c5 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -334,7 +334,7 @@ static inline void netif_trans_update(struct net_device *dev) (_dev)->needs_free_netdev = true; #endif -#if LINUX_VERSION_IS_LESS(4,14,0) +#if LINUX_VERSION_IS_LESS(4,15,0) static inline int _bp_netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev) { -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (10 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 Hauke Mehrtens ` (2 subsequent siblings) 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens In Linux commit d19c3d91d1cf3 ("Revert "net: use lib/percpu_counter API for fragmentation mem accounting"") the sub_frag_mem_limit() and add_frag_mem_limit() functions were changed back to the old versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/net/inet_frag.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backport/backport-include/net/inet_frag.h b/backport/backport-include/net/inet_frag.h index e95eac33..f37b8a5b 100644 --- a/backport/backport-include/net/inet_frag.h +++ b/backport/backport-include/net/inet_frag.h @@ -29,7 +29,7 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, #endif /* LINUX_VERSION_IS_LESS(3,9,0) */ /* the type of the paramater changed with kernel 4.3 */ -#if LINUX_VERSION_IS_LESS(3,9,0) +#if LINUX_VERSION_IS_LESS(3,9,0) || LINUX_VERSION_IN_RANGE(3,16,51, 3,17,0) #define sub_frag_mem_limit LINUX_BACKPORT(sub_frag_mem_limit) static inline void sub_frag_mem_limit(struct netns_frags *nf, int i) { -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (11 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver Hauke Mehrtens 2018-03-21 8:20 ` [PATCH 00/14] backports: multiple fixes and Realtek drivers Johannes Berg 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens The mt76 driver uses the devm_led_classdev_register() function which was added in kernel 4.1, do not build this driver on older kernel versions. It is probably not so hard to make this driver also work on older kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- dependencies | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies b/dependencies index 2741cbeb..92d7dc2c 100644 --- a/dependencies +++ b/dependencies @@ -162,3 +162,7 @@ USB_NET_RNDIS_WLAN 4.6 # depends on struct mmc_card::ocr RSI_SDIO 3.13 + +# depends on devm_led_classdev_register() +MT76_CORE 4.1 +MT76x2E 4.1 -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (12 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 Hauke Mehrtens @ 2018-03-04 22:57 ` Hauke Mehrtens 2018-03-21 8:20 ` [PATCH 00/14] backports: multiple fixes and Realtek drivers Johannes Berg 14 siblings, 0 replies; 17+ messages in thread From: Hauke Mehrtens @ 2018-03-04 22:57 UTC (permalink / raw) To: backports; +Cc: johannes, Hauke Mehrtens This adds the staging Realtek drivers which are making use of cfg80211 and mac80211. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/Kconfig.sources | 2 ++ backport/Makefile.kernel | 2 ++ copy-list | 6 ++++++ dependencies | 4 ++++ patches/0084-disbale-some-staging-dirs.patch | 13 +++++++++++++ patches/0085-not-include-kmemleak.patch | 11 +++++++++++ patches/0086-rtl8723bs-no-extern-inline.patch | 26 ++++++++++++++++++++++++++ 7 files changed, 64 insertions(+) create mode 100644 patches/0084-disbale-some-staging-dirs.patch create mode 100644 patches/0085-not-include-kmemleak.patch create mode 100644 patches/0086-rtl8723bs-no-extern-inline.patch diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index d1d88343..b4083a6d 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -17,3 +17,5 @@ source "$BACKPORT_DIR/net/nfc/Kconfig" source "$BACKPORT_DIR/drivers/media/Kconfig" source "$BACKPORT_DIR/drivers/usb/class/Kconfig" + +source "$BACKPORT_DIR/drivers/staging/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index 6c84c2d7..6eb62cb9 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -52,3 +52,5 @@ obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/ obj-$(CPTCFG_USB_WDM) += drivers/usb/class/ obj-$(CPTCFG_USB_USBNET) += drivers/net/usb/ + +obj-$(CPTCFG_STAGING) += drivers/staging/ diff --git a/copy-list b/copy-list index d36caea3..5c64b6d4 100644 --- a/copy-list +++ b/copy-list @@ -114,6 +114,12 @@ drivers/net/usb/rndis_host.c drivers/net/usb/cdc_ether.c drivers/net/usb/usbnet.c +drivers/staging/Makefile +drivers/staging/Kconfig +drivers/staging/rtlwifi/ +drivers/staging/rtl8188eu/ +drivers/staging/rtl8723bs/ + drivers/usb/class/Makefile drivers/usb/class/Kconfig drivers/usb/class/cdc-wdm.c diff --git a/dependencies b/dependencies index 92d7dc2c..80e72c8a 100644 --- a/dependencies +++ b/dependencies @@ -166,3 +166,7 @@ RSI_SDIO 3.13 # depends on devm_led_classdev_register() MT76_CORE 4.1 MT76x2E 4.1 + +# select_queue_fallback_t is missing +RTL8723BS 3.14 +R8188EU 3.14 diff --git a/patches/0084-disbale-some-staging-dirs.patch b/patches/0084-disbale-some-staging-dirs.patch new file mode 100644 index 00000000..8947130d --- /dev/null +++ b/patches/0084-disbale-some-staging-dirs.patch @@ -0,0 +1,13 @@ +--- a/drivers/staging/Makefile ++++ b/drivers/staging/Makefile +@@ -1,8 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for staging directory + +-obj-y += media/ +-obj-y += typec/ ++#obj-y += media/ ++#obj-y += typec/ + obj-$(CONFIG_IPX) += ipx/ + obj-$(CONFIG_NCP_FS) += ncpfs/ + obj-$(CONFIG_IRDA) += irda/net/ diff --git a/patches/0085-not-include-kmemleak.patch b/patches/0085-not-include-kmemleak.patch new file mode 100644 index 00000000..def245d4 --- /dev/null +++ b/patches/0085-not-include-kmemleak.patch @@ -0,0 +1,11 @@ +--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c ++++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +@@ -13,7 +13,7 @@ + * + ******************************************************************************/ + #define _RTL8188EU_RECV_C_ +-#include <linux/kmemleak.h> ++#include <linux/slab.h> + #include <osdep_service.h> + #include <drv_types.h> + #include <recv_osdep.h> diff --git a/patches/0086-rtl8723bs-no-extern-inline.patch b/patches/0086-rtl8723bs-no-extern-inline.patch new file mode 100644 index 00000000..cc8bba0a --- /dev/null +++ b/patches/0086-rtl8723bs-no-extern-inline.patch @@ -0,0 +1,26 @@ +diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h +index 73ce637..fa9c80f 100644 +--- a/drivers/staging/rtl8723bs/include/ieee80211.h ++++ b/drivers/staging/rtl8723bs/include/ieee80211.h +@@ -1008,18 +1008,18 @@ enum ieee80211_state { + #define IP_FMT "%pI4" + #define IP_ARG(x) (x) + +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static inline int is_multicast_mac_addr(const u8 *addr) + { + return ((addr[0] != 0xff) && (0x01 & addr[0])); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 00/14] backports: multiple fixes and Realtek drivers 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens ` (13 preceding siblings ...) 2018-03-04 22:57 ` [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver Hauke Mehrtens @ 2018-03-21 8:20 ` Johannes Berg 14 siblings, 0 replies; 17+ messages in thread From: Johannes Berg @ 2018-03-21 8:20 UTC (permalink / raw) To: Hauke Mehrtens, backports On Sun, 2018-03-04 at 23:57 +0100, Hauke Mehrtens wrote: > This fixes multiple smaller problems I found when using kernel 4.16-rc3 > as a base. I am still getting many liker problems at the end, see this > result: > I've applied all of these for now - we can sort out the timer thing later if needed/possible. johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2018-03-21 8:20 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Hauke Mehrtens 2018-03-21 7:59 ` Johannes Berg 2018-03-04 22:57 ` [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 05/14] header: types.h: add __poll_t Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 06/14] header: kernel.h: include bug.h Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 08/14] header: nospec.h: provide dummy header file Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 Hauke Mehrtens 2018-03-04 22:57 ` [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver Hauke Mehrtens 2018-03-21 8:20 ` [PATCH 00/14] backports: multiple fixes and Realtek drivers Johannes Berg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).