* [PATCH 0/2] backports: to make iwlwifi compile under v5.1-rc1 @ 2019-03-19 6:09 AceLan Kao 2019-03-19 6:09 ` [PATCH 1/2] backports: remove mt76.patch AceLan Kao 2019-03-19 6:09 ` [PATCH 2/2] backports: update backport/backport-include/net/netlink.h AceLan Kao 0 siblings, 2 replies; 5+ messages in thread From: AceLan Kao @ 2019-03-19 6:09 UTC (permalink / raw) To: hauke, mcgrof, backports Trying to backport iwlwifi driver from v5.1-rc1, and did some necessary modifications. AceLan Kao (2): backports: remove mt76.patch backports: update backport/backport-include/net/netlink.h backport/backport-include/net/netlink.h | 8 ++++++-- patches/0013-fix-makefile-includes/mt76.patch | 10 ---------- 2 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] backports: remove mt76.patch 2019-03-19 6:09 [PATCH 0/2] backports: to make iwlwifi compile under v5.1-rc1 AceLan Kao @ 2019-03-19 6:09 ` AceLan Kao 2019-03-19 6:09 ` [PATCH 2/2] backports: update backport/backport-include/net/netlink.h AceLan Kao 1 sibling, 0 replies; 5+ messages in thread From: AceLan Kao @ 2019-03-19 6:09 UTC (permalink / raw) To: hauke, mcgrof, backports The patch patches/0013-fix-makefile-includes/mt76.patch was added in upstream Linux commit 85b7e2acd31b ("mt76: Add missing include of linux/module.h") which was added in v5.1-rc1 Signed-off-by: AceLan Kao <acelan.kao@canonical.com> --- patches/0013-fix-makefile-includes/mt76.patch | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch diff --git a/patches/0013-fix-makefile-includes/mt76.patch b/patches/0013-fix-makefile-includes/mt76.patch deleted file mode 100644 index 4f122c46..00000000 --- a/patches/0013-fix-makefile-includes/mt76.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c -+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c -@@ -15,6 +15,7 @@ - */ - #include <linux/kernel.h> - #include <linux/firmware.h> -+#include <linux/module.h> - - #include "mt76x0.h" - #include "mcu.h" -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] backports: update backport/backport-include/net/netlink.h 2019-03-19 6:09 [PATCH 0/2] backports: to make iwlwifi compile under v5.1-rc1 AceLan Kao 2019-03-19 6:09 ` [PATCH 1/2] backports: remove mt76.patch AceLan Kao @ 2019-03-19 6:09 ` AceLan Kao 2019-03-19 21:50 ` Hauke Mehrtens 1 sibling, 1 reply; 5+ messages in thread From: AceLan Kao @ 2019-03-19 6:09 UTC (permalink / raw) To: hauke, mcgrof, backports Add new macros introduced from 23323289b154 netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments Signed-off-by: AceLan Kao <acelan.kao@canonical.com> --- backport/backport-include/net/netlink.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h index 4af73631..6f6630ae 100644 --- a/backport/backport-include/net/netlink.h +++ b/backport/backport-include/net/netlink.h @@ -59,10 +59,14 @@ struct backport_nla_policy { #define NLA_POLICY_ETH_ADDR NLA_POLICY_EXACT_LEN(ETH_ALEN) #define NLA_POLICY_ETH_ADDR_COMPAT NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN) -#define NLA_POLICY_NESTED(maxattr, policy) \ +#define _NLA_POLICY_NESTED(maxattr, policy) \ { .type = NLA_NESTED, .validation_data = policy, .len = maxattr } -#define NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ +#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ { .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr } +#define NLA_POLICY_NESTED(policy) \ + _NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy) +#define NLA_POLICY_NESTED_ARRAY(policy) \ + _NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy) #define __NLA_ENSURE(condition) (sizeof(char[1 - 2*!(condition)]) - 1) #define NLA_ENSURE_INT_TYPE(tp) \ -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] backports: update backport/backport-include/net/netlink.h 2019-03-19 6:09 ` [PATCH 2/2] backports: update backport/backport-include/net/netlink.h AceLan Kao @ 2019-03-19 21:50 ` Hauke Mehrtens 2019-03-20 2:34 ` AceLan Kao 0 siblings, 1 reply; 5+ messages in thread From: Hauke Mehrtens @ 2019-03-19 21:50 UTC (permalink / raw) To: AceLan Kao, mcgrof, backports On 3/19/19 7:09 AM, AceLan Kao wrote: > Add new macros introduced from > 23323289b154 netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments > > Signed-off-by: AceLan Kao <acelan.kao@canonical.com> > --- > backport/backport-include/net/netlink.h | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h > index 4af73631..6f6630ae 100644 > --- a/backport/backport-include/net/netlink.h > +++ b/backport/backport-include/net/netlink.h > @@ -59,10 +59,14 @@ struct backport_nla_policy { > #define NLA_POLICY_ETH_ADDR NLA_POLICY_EXACT_LEN(ETH_ALEN) > #define NLA_POLICY_ETH_ADDR_COMPAT NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN) > > -#define NLA_POLICY_NESTED(maxattr, policy) \ > +#define _NLA_POLICY_NESTED(maxattr, policy) \ > { .type = NLA_NESTED, .validation_data = policy, .len = maxattr } > -#define NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ > +#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ > { .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr } > +#define NLA_POLICY_NESTED(policy) \ > + _NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy) > +#define NLA_POLICY_NESTED_ARRAY(policy) \ > + _NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy) > > #define __NLA_ENSURE(condition) (sizeof(char[1 - 2*!(condition)]) - 1) > #define NLA_ENSURE_INT_TYPE(tp) \ > This is only added for kernel < 4.20, there is a ifdef around, there is also a backport needed for kernel 4.20 till 5.0. Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] backports: update backport/backport-include/net/netlink.h 2019-03-19 21:50 ` Hauke Mehrtens @ 2019-03-20 2:34 ` AceLan Kao 0 siblings, 0 replies; 5+ messages in thread From: AceLan Kao @ 2019-03-20 2:34 UTC (permalink / raw) To: Hauke Mehrtens; +Cc: Luis R. Rodriguez, backports Right, I'll submit v2 soon. Hauke Mehrtens <hauke@hauke-m.de> 於 2019年3月20日 週三 上午5:50寫道: > > On 3/19/19 7:09 AM, AceLan Kao wrote: > > Add new macros introduced from > > 23323289b154 netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments > > > > Signed-off-by: AceLan Kao <acelan.kao@canonical.com> > > --- > > backport/backport-include/net/netlink.h | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h > > index 4af73631..6f6630ae 100644 > > --- a/backport/backport-include/net/netlink.h > > +++ b/backport/backport-include/net/netlink.h > > @@ -59,10 +59,14 @@ struct backport_nla_policy { > > #define NLA_POLICY_ETH_ADDR NLA_POLICY_EXACT_LEN(ETH_ALEN) > > #define NLA_POLICY_ETH_ADDR_COMPAT NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN) > > > > -#define NLA_POLICY_NESTED(maxattr, policy) \ > > +#define _NLA_POLICY_NESTED(maxattr, policy) \ > > { .type = NLA_NESTED, .validation_data = policy, .len = maxattr } > > -#define NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ > > +#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ > > { .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr } > > +#define NLA_POLICY_NESTED(policy) \ > > + _NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy) > > +#define NLA_POLICY_NESTED_ARRAY(policy) \ > > + _NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy) > > > > #define __NLA_ENSURE(condition) (sizeof(char[1 - 2*!(condition)]) - 1) > > #define NLA_ENSURE_INT_TYPE(tp) \ > > > > This is only added for kernel < 4.20, there is a ifdef around, there is > also a backport needed for kernel 4.20 till 5.0. > > Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-20 2:34 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-03-19 6:09 [PATCH 0/2] backports: to make iwlwifi compile under v5.1-rc1 AceLan Kao 2019-03-19 6:09 ` [PATCH 1/2] backports: remove mt76.patch AceLan Kao 2019-03-19 6:09 ` [PATCH 2/2] backports: update backport/backport-include/net/netlink.h AceLan Kao 2019-03-19 21:50 ` Hauke Mehrtens 2019-03-20 2:34 ` AceLan Kao
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).