diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-24 11:57:27 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-24 12:22:29 +0100 |
| commit | 703515f889124248480f39d65f8704548cbf1c09 (patch) | |
| tree | cd06f11ec2cc4e6ddb75c8982ecaab9882d3a9ed /package/kernel/mac80211/patches/011-backport_strscpy.patch | |
| parent | d27dd6298b0f9a66199758b32ce19c0932ef2ee0 (diff) | |
| download | upstream-703515f889124248480f39d65f8704548cbf1c09.tar.gz upstream-703515f889124248480f39d65f8704548cbf1c09.tar.bz2 upstream-703515f889124248480f39d65f8704548cbf1c09.zip | |
mac80211: sync with master branch as of 9edff13abd97
Includes the following changes:
9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions
75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode
368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups
66a63d25c4 mac80211: fix build on linux 3.18
9eacb9d7fc rt2x00: mt7620: lots of improvements
fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9
649e766a64 mac80211: update to wireless-testing 2017-01-31
47540afa5d ath9k: add a warning to the tx99 config option
b367eef21d mac80211: rt2x00: add support for external LNA on MT7620
9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/011-backport_strscpy.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/011-backport_strscpy.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/011-backport_strscpy.patch b/package/kernel/mac80211/patches/011-backport_strscpy.patch new file mode 100644 index 0000000000..c8e26c46f2 --- /dev/null +++ b/package/kernel/mac80211/patches/011-backport_strscpy.patch @@ -0,0 +1,43 @@ +--- a/backport-include/linux/string.h ++++ b/backport-include/linux/string.h +@@ -25,4 +25,8 @@ extern void *memdup_user_nul(const void + void memzero_explicit(void *s, size_t count); + #endif + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)) ++ssize_t strscpy(char *dest, const char *src, size_t count); ++#endif ++ + #endif /* __BACKPORT_LINUX_STRING_H */ +--- a/compat/backport-4.3.c ++++ b/compat/backport-4.3.c +@@ -57,3 +57,29 @@ void seq_hex_dump(struct seq_file *m, co + } + } + EXPORT_SYMBOL_GPL(seq_hex_dump); ++ ++ssize_t strscpy(char *dest, const char *src, size_t count) ++{ ++ long res = 0; ++ ++ if (count == 0) ++ return -E2BIG; ++ ++ while (count) { ++ char c; ++ ++ c = src[res]; ++ dest[res] = c; ++ if (!c) ++ return res; ++ res++; ++ count--; ++ } ++ ++ /* Hit buffer length without finding a NUL; force NUL-termination. */ ++ if (res) ++ dest[res-1] = '\0'; ++ ++ return -E2BIG; ++} ++EXPORT_SYMBOL_GPL(strscpy); |