Backports Archive on lore.kernel.org
 help / color / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: Johannes Berg <johannes@sipsolutions.net>, backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Subject: Re: [PATCH 2/3] backports: skbuff: add skb_list_walk_safe() and skb_mark_not_on_list()
Date: Sat, 21 Mar 2020 00:38:39 +0100
Message-ID: <a9273679-e6ed-e0cb-ad5a-1b2e014a17f2@hauke-m.de> (raw)
In-Reply-To: <20200312165913.0915e5af7240.I35d006756fc2f08463616f8717f02d20ac80153d@changeid>

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

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 15:59 [PATCH 1/3] backports: add linux/units.h Johannes Berg
2020-03-12 15:59 ` [PATCH 2/3] backports: skbuff: add skb_list_walk_safe() and skb_mark_not_on_list() Johannes Berg
2020-03-20 23:38   ` Hauke Mehrtens [this message]
2020-03-12 15:59 ` [PATCH 3/3] backports: netlink: fix nla_validate_nested() Johannes Berg
2020-03-20 23:39 ` [PATCH 1/3] backports: add linux/units.h Hauke Mehrtens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a9273679-e6ed-e0cb-ad5a-1b2e014a17f2@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=backports@vger.kernel.org \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Backports Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/backports/0 backports/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 backports backports/ https://lore.kernel.org/backports \
		backports@vger.kernel.org
	public-inbox-index backports

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.backports


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git