* [PATCH 1/7] backports: Remove get_user_pages() functions
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 2/7] backports: Add DEFINE_SHOW_ATTRIBUTE macro Hauke Mehrtens
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
These functions are not used by any driver any more, remove them. They
were introduced for the frame vector code which was used by the media
subsystem. They also case some compile problems with kernel 4.4 which
get fixed by just removing this code.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/mm.h | 70 -----------
backport/compat/backport-4.0.c | 179 ---------------------------
2 files changed, 249 deletions(-)
diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h
index 38c452e2..b28156d3 100644
--- a/backport/backport-include/linux/mm.h
+++ b/backport/backport-include/linux/mm.h
@@ -7,81 +7,11 @@
#include <linux/vmalloc.h>
#include <linux/slab.h>
-#ifndef VM_NODUMP
-/*
- * defined here to allow things to compile but technically
- * using this for memory regions will yield in a no-op on newer
- * kernels but on older kernels (v3.3 and older) this bit was used
- * for VM_ALWAYSDUMP. The goal was to remove this bit moving forward
- * and since we can't skip the core dump on old kernels we just make
- * this bit name now a no-op.
- *
- * For details see commits: 909af7 accb61fe cdaaa7003
- */
-#define VM_NODUMP 0x0
-#endif
-
-#ifndef VM_DONTDUMP
-#define VM_DONTDUMP VM_NODUMP
-#endif
-
#if LINUX_VERSION_IS_LESS(3,15,0)
#define kvfree LINUX_BACKPORT(kvfree)
void kvfree(const void *addr);
#endif /* < 3.15 */
-#if LINUX_VERSION_IS_LESS(3,20,0)
-#define get_user_pages_locked LINUX_BACKPORT(get_user_pages_locked)
-long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages, int *locked);
-#define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
-long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages);
-#elif LINUX_VERSION_IS_LESS(4,6,0)
-static inline
-long backport_get_user_pages_locked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages, int *locked)
-{
- return get_user_pages_locked(current, current->mm, start, nr_pages,
- write, force, pages, locked);
-}
-#define get_user_pages_locked LINUX_BACKPORT(get_user_pages_locked)
-
-static inline
-long backport_get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages)
-{
- return get_user_pages_unlocked(current, current->mm, start, nr_pages,
- write, force, pages);
-}
-#define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
-#endif
-
-#if LINUX_VERSION_IS_LESS(4,6,0)
-static inline
-long backport_get_user_pages(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages,
- struct vm_area_struct **vmas)
-{
- return get_user_pages(current, current->mm, start, nr_pages,
- write, force, pages, vmas);
-}
-#define get_user_pages LINUX_BACKPORT(get_user_pages)
-#endif
-
-#ifndef FOLL_TRIED
-#define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */
-#endif
-
-#if LINUX_VERSION_IS_LESS(4,1,9) && \
- LINUX_VERSION_IS_GEQ(3,6,0)
-#define page_is_pfmemalloc LINUX_BACKPORT(page_is_pfmemalloc)
-static inline bool page_is_pfmemalloc(struct page *page)
-{
- return page->pfmemalloc;
-}
-#endif /* < 4.2 */
-
#if LINUX_VERSION_IS_LESS(4,12,0)
#define kvmalloc LINUX_BACKPORT(kvmalloc)
static inline void *kvmalloc(size_t size, gfp_t flags)
diff --git a/backport/compat/backport-4.0.c b/backport/compat/backport-4.0.c
index eb950826..84a4c6bf 100644
--- a/backport/compat/backport-4.0.c
+++ b/backport/compat/backport-4.0.c
@@ -15,187 +15,8 @@
#include <linux/printk.h>
#include <linux/export.h>
#include <linux/trace_seq.h>
-#include <linux/ftrace_event.h>
#include <asm/unaligned.h>
-static __always_inline long __get_user_pages_locked(struct task_struct *tsk,
- struct mm_struct *mm,
- unsigned long start,
- unsigned long nr_pages,
- int write, int force,
- struct page **pages,
- struct vm_area_struct **vmas,
- int *locked, bool notify_drop,
- unsigned int flags)
-{
- long ret, pages_done;
- bool lock_dropped;
-
- if (locked) {
- /* if VM_FAULT_RETRY can be returned, vmas become invalid */
- BUG_ON(vmas);
- /* check caller initialized locked */
- BUG_ON(*locked != 1);
- }
-
- if (pages)
- flags |= FOLL_GET;
- if (write)
- flags |= FOLL_WRITE;
- if (force)
- flags |= FOLL_FORCE;
-
- pages_done = 0;
- lock_dropped = false;
- for (;;) {
- ret = __get_user_pages(tsk, mm, start, nr_pages, flags, pages,
- vmas, locked);
- if (!locked)
- /* VM_FAULT_RETRY couldn't trigger, bypass */
- return ret;
-
- /* VM_FAULT_RETRY cannot return errors */
- if (!*locked) {
- BUG_ON(ret < 0);
- BUG_ON(ret >= nr_pages);
- }
-
- if (!pages)
- /* If it's a prefault don't insist harder */
- return ret;
-
- if (ret > 0) {
- nr_pages -= ret;
- pages_done += ret;
- if (!nr_pages)
- break;
- }
- if (*locked) {
- /* VM_FAULT_RETRY didn't trigger */
- if (!pages_done)
- pages_done = ret;
- break;
- }
- /* VM_FAULT_RETRY triggered, so seek to the faulting offset */
- pages += ret;
- start += ret << PAGE_SHIFT;
-
- /*
- * Repeat on the address that fired VM_FAULT_RETRY
- * without FAULT_FLAG_ALLOW_RETRY but with
- * FAULT_FLAG_TRIED.
- */
- *locked = 1;
- lock_dropped = true;
- down_read(&mm->mmap_sem);
- ret = __get_user_pages(tsk, mm, start, 1, flags | FOLL_TRIED,
- pages, NULL, NULL);
- if (ret != 1) {
- BUG_ON(ret > 1);
- if (!pages_done)
- pages_done = ret;
- break;
- }
- nr_pages--;
- pages_done++;
- if (!nr_pages)
- break;
- pages++;
- start += PAGE_SIZE;
- }
- if (notify_drop && lock_dropped && *locked) {
- /*
- * We must let the caller know we temporarily dropped the lock
- * and so the critical section protected by it was lost.
- */
- up_read(&mm->mmap_sem);
- *locked = 0;
- }
- return pages_done;
-}
-
-/*
- * We can leverage the VM_FAULT_RETRY functionality in the page fault
- * paths better by using either get_user_pages_locked() or
- * get_user_pages_unlocked().
- *
- * get_user_pages_locked() is suitable to replace the form:
- *
- * down_read(&mm->mmap_sem);
- * do_something()
- * get_user_pages(tsk, mm, ..., pages, NULL);
- * up_read(&mm->mmap_sem);
- *
- * to:
- *
- * int locked = 1;
- * down_read(&mm->mmap_sem);
- * do_something()
- * get_user_pages_locked(tsk, mm, ..., pages, &locked);
- * if (locked)
- * up_read(&mm->mmap_sem);
- */
-long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages,
- int *locked)
-{
- return __get_user_pages_locked(current, current->mm, start, nr_pages,
- write, force, pages, NULL, locked, true,
- FOLL_TOUCH);
-}
-EXPORT_SYMBOL_GPL(get_user_pages_locked);
-
-/*
- * Same as get_user_pages_unlocked(...., FOLL_TOUCH) but it allows to
- * pass additional gup_flags as last parameter (like FOLL_HWPOISON).
- *
- * NOTE: here FOLL_TOUCH is not set implicitly and must be set by the
- * caller if required (just like with __get_user_pages). "FOLL_GET",
- * "FOLL_WRITE" and "FOLL_FORCE" are set implicitly as needed
- * according to the parameters "pages", "write", "force"
- * respectively.
- */
-static __always_inline long __get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm,
- unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages,
- unsigned int gup_flags)
-{
- long ret;
- int locked = 1;
- down_read(&mm->mmap_sem);
- ret = __get_user_pages_locked(tsk, mm, start, nr_pages, write, force,
- pages, NULL, &locked, false, gup_flags);
- if (locked)
- up_read(&mm->mmap_sem);
- return ret;
-}
-
-/*
- * get_user_pages_unlocked() is suitable to replace the form:
- *
- * down_read(&mm->mmap_sem);
- * get_user_pages(tsk, mm, ..., pages, NULL);
- * up_read(&mm->mmap_sem);
- *
- * with:
- *
- * get_user_pages_unlocked(tsk, mm, ..., pages);
- *
- * It is functionally equivalent to get_user_pages_fast so
- * get_user_pages_fast should be used instead, if the two parameters
- * "tsk" and "mm" are respectively equal to current and current->mm,
- * or if "force" shall be set to 1 (get_user_pages_fast misses the
- * "force" parameter).
- */
-long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
- int write, int force, struct page **pages)
-{
- return __get_user_pages_unlocked(current, current->mm, start, nr_pages,
- write, force, pages, FOLL_TOUCH);
-}
-EXPORT_SYMBOL_GPL(get_user_pages_unlocked);
-
-
/**
* hex_dump_to_buffer - convert a blob of data to "hex ASCII" in memory
* @buf: data blob to dump
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/7] backports: Add DEFINE_SHOW_ATTRIBUTE macro
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 1/7] backports: Remove get_user_pages() functions Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 3/7] backports: Add nl_set_extack_cookie_u64() Hauke Mehrtens
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This was introduced in Linux commit a08f06bb7a07 ("seq_file: Introduce
DEFINE_SHOW_ATTRIBUTE() helper macro" and is used by the cw1200 and the
wil6210 driver.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/seq_file.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/backport/backport-include/linux/seq_file.h b/backport/backport-include/linux/seq_file.h
index ad1bded5..5b88f6f8 100644
--- a/backport/backport-include/linux/seq_file.h
+++ b/backport/backport-include/linux/seq_file.h
@@ -48,4 +48,20 @@ void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
bool ascii);
#endif
+#ifndef DEFINE_SHOW_ATTRIBUTE
+#define DEFINE_SHOW_ATTRIBUTE(__name) \
+static int __name ## _open(struct inode *inode, struct file *file) \
+{ \
+ return single_open(file, __name ## _show, inode->i_private); \
+} \
+ \
+static const struct file_operations __name ## _fops = { \
+ .owner = THIS_MODULE, \
+ .open = __name ## _open, \
+ .read = seq_read, \
+ .llseek = seq_lseek, \
+ .release = single_release, \
+}
+#endif /* DEFINE_SHOW_ATTRIBUTE */
+
#endif /* __BACKPORT_SEQ_FILE_H */
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/7] backports: Add nl_set_extack_cookie_u64()
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 1/7] backports: Remove get_user_pages() functions Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 2/7] backports: Add DEFINE_SHOW_ATTRIBUTE macro Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 4/7] backports: Add CORDIC_FLOAT Hauke Mehrtens
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This was introduced in Linux commit 801f87469ee8 ("netlink: add
nl_set_extack_cookie_u64()") and is used by the wireless subsystem.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/netlink.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/backport/backport-include/linux/netlink.h b/backport/backport-include/linux/netlink.h
index f956a769..0fb8e0f3 100644
--- a/backport/backport-include/linux/netlink.h
+++ b/backport/backport-include/linux/netlink.h
@@ -58,4 +58,15 @@ struct netlink_ext_ack {
} while (0)
#endif /* NL_SET_BAD_ATTR */
+#if LINUX_VERSION_IS_LESS(5,0,0)
+static inline void nl_set_extack_cookie_u64(struct netlink_ext_ack *extack,
+ u64 cookie)
+{
+ u64 __cookie = cookie;
+
+ memcpy(extack->cookie, &__cookie, sizeof(__cookie));
+ extack->cookie_len = sizeof(__cookie);
+}
+#endif
+
#endif /* __BACKPORT_LINUX_NETLINK_H */
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/7] backports: Add CORDIC_FLOAT
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
` (2 preceding siblings ...)
2019-01-26 22:00 ` [PATCH 3/7] backports: Add nl_set_extack_cookie_u64() Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 5/7] backports: Add extra parameter to dev_open() Hauke Mehrtens
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This was introduced in Linux commit 58d81d64e06f ("lib: cordic: Move
cordic macros and defines to header file") and is used by the b43 and
brcmsmac driver.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/cordic.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/backport/backport-include/linux/cordic.h b/backport/backport-include/linux/cordic.h
index 7f27b007..67d6a4ae 100644
--- a/backport/backport-include/linux/cordic.h
+++ b/backport/backport-include/linux/cordic.h
@@ -57,4 +57,16 @@ struct cordic_iq cordic_calc_iq(s32 theta);
#endif /* __CORDIC_H_ */
#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3,1,0)) */
+
+#ifndef CORDIC_FLOAT
+#define CORDIC_ANGLE_GEN 39797
+#define CORDIC_PRECISION_SHIFT 16
+#define CORDIC_NUM_ITER (CORDIC_PRECISION_SHIFT + 2)
+
+#define CORDIC_FIXED(X) ((s32)((X) << CORDIC_PRECISION_SHIFT))
+#define CORDIC_FLOAT(X) (((X) >= 0) \
+ ? ((((X) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1) \
+ : -((((-(X)) >> (CORDIC_PRECISION_SHIFT - 1)) + 1) >> 1))
+#endif
+
#endif /* _BACKPORT_LINUX_CORDIC_H */
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/7] backports: Add extra parameter to dev_open()
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
` (3 preceding siblings ...)
2019-01-26 22:00 ` [PATCH 4/7] backports: Add CORDIC_FLOAT Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 6/7] backports: Rename QTNFMAC_PEARL_PCIE to QTNFMAC_PCIE Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 7/7] backports: refresh patches on top of 5.0-rc3 Hauke Mehrtens
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
dev_open() got the extra parameter extack in Linux commit 00f54e68924e
("net: core: dev: Add extack argument to dev_open()"), just ignore it on
older kernel versions. This is used by the hostap driver.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/netdevice.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index 44319331..c3e91a0c 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -358,4 +358,12 @@ static inline int _bp_netdev_upper_dev_link(struct net_device *dev,
macro_dispatcher(netdev_upper_dev_link, __VA_ARGS__)(__VA_ARGS__)
#endif
+#if LINUX_VERSION_IS_LESS(5,0,0)
+static inline int backport_dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
+{
+ return dev_open(dev);
+}
+#define dev_open LINUX_BACKPORT(dev_open)
+#endif
+
#endif /* __BACKPORT_NETDEVICE_H */
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/7] backports: Rename QTNFMAC_PEARL_PCIE to QTNFMAC_PCIE
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
` (4 preceding siblings ...)
2019-01-26 22:00 ` [PATCH 5/7] backports: Add extra parameter to dev_open() Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
2019-01-26 22:00 ` [PATCH 7/7] backports: refresh patches on top of 5.0-rc3 Hauke Mehrtens
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
The name of this configuration option was changed in Linux commit
b7da53cd6cd1 ("qtnfmac_pcie: use single PCIe driver for all platforms").
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/defconfigs/wifi | 2 +-
dependencies | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index e4c140a9..4f6929dd 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -82,7 +82,7 @@ CPTCFG_PCMCIA_HERMES=m
CPTCFG_PCMCIA_SPECTRUM=m
CPTCFG_PLX_HERMES=m
CPTCFG_RSI_91X=m
-CPTCFG_QTNFMAC_PEARL_PCIE=m
+CPTCFG_QTNFMAC_PCIE=m
CPTCFG_R8188EU=m
CPTCFG_R8822BE=m
CPTCFG_RT2400PCI=m
diff --git a/dependencies b/dependencies
index f22b6412..7361e60d 100644
--- a/dependencies
+++ b/dependencies
@@ -25,7 +25,7 @@ AIRO_CS 3.9
MWIFIEX_PCIE 3.16
# needs pcie_get_mps()
-QTNFMAC_PEARL_PCIE 3.13
+QTNFMAC_PCIE 3.13
# needs pm_system_wakeup() which can't reall be
# backported properly
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 7/7] backports: refresh patches on top of 5.0-rc3
2019-01-26 22:00 [PATCH 0/7] backport: update to Linux 5.0-rc3 Hauke Mehrtens
` (5 preceding siblings ...)
2019-01-26 22:00 ` [PATCH 6/7] backports: Rename QTNFMAC_PEARL_PCIE to QTNFMAC_PCIE Hauke Mehrtens
@ 2019-01-26 22:00 ` Hauke Mehrtens
6 siblings, 0 replies; 8+ messages in thread
From: Hauke Mehrtens @ 2019-01-26 22:00 UTC (permalink / raw)
To: backports; +Cc: 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 ++--
patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch | 2 +-
patches/0003-cfg80211-wext-padding/net_wireless_core.patch | 2 +-
.../0010-add-wext-handlers-to-netdev/net_wireless_core.patch | 4 ++--
patches/0014-netlink_seq/net_wireless_nl80211.patch | 2 +-
patches/0024-led-blink-api/mac80211.patch | 2 +-
patches/0028-select_queue/mac80211.patch | 4 ++--
patches/0053-possible_net_t.patch | 2 +-
patches/0069-iwlwifi-pd-string-fix.patch | 4 ++--
patches/0077-genl-ro-after-init/hwsim.patch | 2 +-
patches/0077-genl-ro-after-init/nl80211.patch | 2 +-
patches/0085-iwlwifi-pci-device-removal.patch | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index fa379bfe..8e623c88 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
-@@ -2204,6 +2204,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2364,6 +2364,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
-@@ -2225,6 +2226,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2385,6 +2386,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 12f607d1..441095f2 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
-@@ -4031,6 +4031,9 @@ struct wiphy_iftype_ext_capab {
+@@ -4270,6 +4270,9 @@ struct cfg80211_pmsr_capabilities {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/0003-cfg80211-wext-padding/net_wireless_core.patch b/patches/0003-cfg80211-wext-padding/net_wireless_core.patch
index 011e3741..e1eca55d 100644
--- a/patches/0003-cfg80211-wext-padding/net_wireless_core.patch
+++ b/patches/0003-cfg80211-wext-padding/net_wireless_core.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -388,6 +388,17 @@ struct wiphy *wiphy_new_nm(const struct
+@@ -403,6 +403,17 @@ struct wiphy *wiphy_new_nm(const struct
struct cfg80211_registered_device *rdev;
int alloc_size;
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 735599d5..65165cf3 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
-@@ -481,10 +481,6 @@ use_default_name:
+@@ -496,10 +496,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;
-@@ -1235,6 +1231,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1283,6 +1279,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 e1c730bf..67380322 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
-@@ -8158,7 +8158,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -8381,7 +8381,9 @@ static int nl80211_dump_scan(struct sk_b
if (start == 0)
cfg80211_bss_expire(rdev);
diff --git a/patches/0024-led-blink-api/mac80211.patch b/patches/0024-led-blink-api/mac80211.patch
index 00a4007c..35279826 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
-@@ -1291,6 +1291,7 @@ struct ieee80211_local {
+@@ -1292,6 +1292,7 @@ struct ieee80211_local {
struct mutex chanctx_mtx;
#ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/0028-select_queue/mac80211.patch b/patches/0028-select_queue/mac80211.patch
index 82bf659f..bca6793a 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
-@@ -1128,10 +1128,25 @@ static void ieee80211_uninit(struct net_
+@@ -1131,10 +1131,25 @@ static void ieee80211_uninit(struct net_
ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
}
@@ -26,7 +26,7 @@
{
return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
}
-@@ -1174,10 +1189,25 @@ static const struct net_device_ops ieee8
+@@ -1177,10 +1192,25 @@ static const struct net_device_ops ieee8
.ndo_get_stats64 = ieee80211_get_stats64,
};
diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch
index 0fc1d23e..a7d7b75f 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
-@@ -4171,12 +4171,12 @@ struct wiphy {
+@@ -4412,12 +4412,12 @@ struct wiphy {
static inline struct net *wiphy_net(struct wiphy *wiphy)
{
diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch
index ca7732d0..f6f7d60a 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
-@@ -1492,8 +1492,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
+@@ -1484,8 +1484,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;
}
-@@ -1539,15 +1544,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
+@@ -1531,15 +1536,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
* find
* netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
*/
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 6a1b7022..e12d8b4a 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
-@@ -3546,7 +3546,7 @@ static const struct genl_ops hwsim_ops[]
+@@ -3646,7 +3646,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 a897be35..e3505a0b 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
-@@ -13904,7 +13904,7 @@ static const struct genl_ops nl80211_ops
+@@ -14145,7 +14145,7 @@ static const struct genl_ops nl80211_ops
},
};
diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch
index f61f0172..84fa7f92 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 cc8c53dc0ab6..68296b65a680 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1941,6 +1941,9 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1968,6 +1968,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 cc8c53dc0ab6..68296b65a680 100644
char *prop[] = {"EVENT=INACCESSIBLE", NULL};
dev_err(&pdev->dev, "Device gone - attempting removal\n");
-@@ -1949,6 +1952,7 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1976,6 +1979,7 @@ static void iwl_trans_pcie_removal_wk(st
pci_dev_put(pdev);
pci_stop_and_remove_bus_device(pdev);
pci_unlock_rescan_remove();
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 8+ messages in thread