From: Johannes Berg <johannes.berg@intel.com> We can just copy this. Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- copy-list | 1 + copy-list.intel | 1 + 2 files changed, 2 insertions(+) diff --git a/copy-list b/copy-list index 328e92d0fde5..ba10a0bf4b3a 100644 --- a/copy-list +++ b/copy-list @@ -23,6 +23,7 @@ include/linux/crc32poly.h include/linux/bitfield.h include/linux/average.h include/linux/overflow.h +include/linux/units.h # crypto_memneq crypto/memneq.c -> compat/memneq.c diff --git a/copy-list.intel b/copy-list.intel index ee944edaaefb..28b6bc87ddfe 100644 --- a/copy-list.intel +++ b/copy-list.intel @@ -21,6 +21,7 @@ scripts/spelling.txt -> intc-scripts/spelling.txt include/linux/bitfield.h include/linux/average.h include/linux/overflow.h +include/linux/units.h # crypto_memneq crypto/memneq.c -> compat/memneq.c -- 2.24.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in
From: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- backport/backport-include/linux/skbuff.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 8af34146432e..3b63ce76a0b5 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -380,6 +380,11 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_) { return list_->next; } + +static inline void skb_mark_not_on_list(struct sk_buff *skb) +{ + skb->next = NULL; +} #endif #if LINUX_VERSION_IS_LESS(4,11,0) @@ -408,4 +413,10 @@ static inline void nf_reset_ct(struct sk_buff *skb) } #endif +#ifndef skb_list_walk_safe +#define skb_list_walk_safe(first, skb, next_skb) \ + for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb); \ + (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL) +#endif + #endif /* __BACKPORT_SKBUFF_H */ -- 2.24.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in
From: Johannes Berg <johannes.berg@intel.com> I had accidentally named this nl80211_validate_nested(), and it got renamed in 5.6. Signed-off-by: Johannes Berg <johannes.berg@intel.com> --- backport/backport-include/net/netlink.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h index bc24adfb4d63..675e43fc4e31 100644 --- a/backport/backport-include/net/netlink.h +++ b/backport/backport-include/net/netlink.h @@ -266,17 +266,17 @@ nla_validate_nested_deprecated(const struct nlattr *start, int maxtype, } #endif /* < 5.2 */ -#if LINUX_VERSION_IS_LESS(5,3,0) -#define nl80211_validate_nested LINUX_BACKPORT(nl80211_validate_nested) +#if LINUX_VERSION_IS_LESS(5,6,0) +#define nla_validate_nested LINUX_BACKPORT(nla_validate_nested) static inline int -nl80211_validate_nested(const struct nlattr *start, int maxtype, - const struct nla_policy *policy, - struct netlink_ext_ack *extack) +nla_validate_nested(const struct nlattr *start, int maxtype, + const struct nla_policy *policy, + struct netlink_ext_ack *extack) { return __nla_validate_nested(start, maxtype, policy, NL_VALIDATE_STRICT, extack); } -#endif /* < 5.3 */ +#endif /* < 5.6 */ #if LINUX_VERSION_IS_LESS(5,1,0) #undef NLA_POLICY_NESTED -- 2.24.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in
On 3/12/20 4:59 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> backport/backport-include/linux/skbuff.h | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
> index 8af34146432e..3b63ce76a0b5 100644
> --- a/backport/backport-include/linux/skbuff.h
> +++ b/backport/backport-include/linux/skbuff.h
> @@ -380,6 +380,11 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_)
> {
> return list_->next;
> }
> +
> +static inline void skb_mark_not_on_list(struct sk_buff *skb)
> +{
> + skb->next = NULL;
> +}
> #endif
skb_mark_not_on_list() was backported to kernel 4.19.10 and this
definition conflicts.
I added this around it:
#if !LINUX_VERSION_IN_RANGE(4,19,10, 4,20,0)
Hauke
--
To unsubscribe from this list: send the line "unsubscribe backports" in
On 3/12/20 4:59 PM, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > We can just copy this. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > copy-list | 1 + > copy-list.intel | 1 + > 2 files changed, 2 insertions(+) > ...... > > # crypto_memneq > crypto/memneq.c -> compat/memneq.c > diff --git a/copy-list.intel b/copy-list.intel > index ee944edaaefb..28b6bc87ddfe 100644 > --- a/copy-list.intel > +++ b/copy-list.intel copy-list.intel is not in upstream, I will just ignore this part. Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in