[PATCH 0/3] backports: enable building v4.17 kernel

[PATCH 0/3] backports: enable building v4.17 kernel

[Arend van Spriel]

This series enables backporting v4.17-rcX kernel sources. It was
not tested against every target kernel, but it does work properly
for 3.11 FC19 kernel.

It applies to the master branch of the backports repository.

Arend van Spriel (3):
  patches: update patches for v4.17-rc1
  backport-include: add ETH_P_PREAUTH definition in if_ether.h
  backport-include: deal with struct sock::sk_pacing_shift

 backport/backport-include/linux/if_ether.h |  4 ++++
 backport/backport-include/net/sock.h       | 12 ++++++++++++
 patches/0004-disable-wext-kconfig.patch    |  4 ++--
 patches/0070-mac80211-fils.patch           |  8 ++++----
 4 files changed, 22 insertions(+), 6 deletions(-)

-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 1/3] patches: update patches for v4.17-rc1

[Arend van Spriel]

Few patches do not apply to source code in v4.17-rc1 so updating
those.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 patches/0004-disable-wext-kconfig.patch | 4 ++--
 patches/0070-mac80211-fils.patch        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/0004-disable-wext-kconfig.patch b/patches/0004-disable-wext-kconfig.patch
index 313ea90..1ed420a 100644
--- a/patches/0004-disable-wext-kconfig.patch
+++ b/patches/0004-disable-wext-kconfig.patch
@@ -25,10 +25,10 @@ so remove the Kconfig options for them.
  config CFG80211
  	tristate "cfg80211 - wireless configuration API"
  	depends on RFKILL || !RFKILL
-@@ -191,7 +173,7 @@ config CFG80211_CRDA_SUPPORT
+@@ -187,7 +169,7 @@ config CFG80211_CRDA_SUPPORT
+
  config CFG80211_WEXT
  	bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT
- 	depends on CFG80211
 -	select WEXT_CORE
 +	depends on WEXT_CORE
  	default y if CFG80211_WEXT_EXPORT
diff --git a/patches/0070-mac80211-fils.patch b/patches/0070-mac80211-fils.patch
index 345e707..d7274e5 100644
--- a/patches/0070-mac80211-fils.patch
+++ b/patches/0070-mac80211-fils.patch
@@ -5,7 +5,7 @@
  /*
   * FILS AEAD for (Re)Association Request/Response frames
   * Copyright 2016, Qualcomm Atheros, Inc.
-@@ -332,3 +333,4 @@ int fils_decrypt_assoc_resp(struct ieee8
+@@ -332,3 +333,4 @@ int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata,
  	*frame_len -= AES_BLOCK_SIZE;
  	return 0;
  }
@@ -42,13 +42,13 @@
  #endif /* FILS_AEAD_H */
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -553,7 +553,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+@@ -553,7 +553,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
  			   NL80211_FEATURE_MAC_ON_CREATE |
  			   NL80211_FEATURE_USERSPACE_MPM |
  			   NL80211_FEATURE_FULL_AP_CLIENT_STATE;
 +#if LINUX_VERSION_IS_GEQ(4,3,0)
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);
 +#endif
+ 	wiphy_ext_feature_set(wiphy,
+ 			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);
  
- 	if (!ops->hw_scan)
- 		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 2/3] backport-include: add ETH_P_PREAUTH definition in if_ether.h

[Arend van Spriel]

This macro definition was added in 4.17-rc1 and used by mac80211
so add it to backport.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 backport/backport-include/linux/if_ether.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backport/backport-include/linux/if_ether.h b/backport/backport-include/linux/if_ether.h
index 55862ce..344480a 100644
--- a/backport/backport-include/linux/if_ether.h
+++ b/backport/backport-include/linux/if_ether.h
@@ -39,6 +39,10 @@
 #define ETH_P_8021AD	0x88A8          /* 802.1ad Service VLAN		*/
 #endif
 
+#ifndef ETH_P_PREAUTH
+#define ETH_P_PREAUTH   0x88C7          /* 802.11 Preauthentication */
+#endif
+
 #ifndef ETH_MIN_MTU
 #define ETH_MIN_MTU	68
 #endif
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 3/3] backport-include: deal with struct sock::sk_pacing_shift

[Arend van Spriel]

In kernel 4.15 the field sk_pacing_shift was introduced to allow
(wifi) drivers to change the behaviour of TSQ. In 4.16 a helper
function was added which mac80211 is using. So backport the helper
which is just a stub for kernels prior to 4.15.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
As noted in the commit message this patch makes the helper function
an empty stub for kernels prior to 4.15, which introduced the field
sk_pacing_shift. Maybe it would be possible to accomplish similar
thing by modifying struct sk_buff::true_size, but I am not too familiar
with TSQ so I did not go there.

Regards,
Arend
---
 backport/backport-include/net/sock.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backport/backport-include/net/sock.h b/backport/backport-include/net/sock.h
index 89191f3..39bf008 100644
--- a/backport/backport-include/net/sock.h
+++ b/backport/backport-include/net/sock.h
@@ -63,4 +63,16 @@ static inline void sk_clear_bit(int nr, struct sock *sk)
 }
 #endif /* < 4.5 */
 
+#if LINUX_VERSION_IS_LESS(4,16,0)
+#define sk_pacing_shift_update LINUX_BACKPORT(sk_pacing_shift_update)
+static inline void sk_pacing_shift_update(struct sock *sk, int val)
+{
+#if LINUX_VERSION_IS_GEQ(4,15,0)
+	if (!sk || !sk_fullsock(sk) || sk->sk_pacing_shift == val)
+		return;
+	sk->sk_pacing_shift = val;
+#endif /* >= 4.15 */
+}
+#endif /* < 4.16 */
+
 #endif /* __BACKPORT_NET_SOCK_H */
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in