patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
To: "Min Hu (Connor)" <humin29@huawei.com>, dev@dpdk.org
Cc: stable@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
	Helin Zhang <helin.zhang@intel.com>
Subject: Re: [PATCH] kni: fix compile error
Date: Tue, 31 May 2022 19:42:22 +0300	[thread overview]
Message-ID: <b11ce44c-d6f7-c35f-b80b-05bbe2736a37@oktetlabs.ru> (raw)
In-Reply-To: <20220521070642.35413-1-humin29@huawei.com>

On 5/21/22 10:06, Min Hu (Connor) wrote:
> When kernel version change into 5.18 from 5.17, 'netif_rx_ni' is discard.
> It is replaced by 'netif_rx' and this API is also supported in the
> version below 5.18.
> 
> This patch fixed it.
> 
> Fixes: d89a58dfe90b ("kni: support chained mbufs")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> ---
>   kernel/linux/kni/kni_net.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
> index 29e5b9e21f..e19f03285e 100644
> --- a/kernel/linux/kni/kni_net.c
> +++ b/kernel/linux/kni/kni_net.c
> @@ -441,7 +441,7 @@ kni_net_rx_normal(struct kni_dev *kni)
>   		skb->ip_summed = CHECKSUM_UNNECESSARY;
>   
>   		/* Call netif interface */
> -		netif_rx_ni(skb);
> +		netif_rx(skb);

I think the approach in [1] is the right one. Any comments?

[1] 
https://patches.dpdk.org/project/dpdk/patch/20220525102641.20982-1-jslaby@suse.cz/

>   
>   		/* Update statistics */
>   		dev->stats.rx_bytes += len;
> @@ -779,7 +779,7 @@ kni_net_set_mac(struct net_device *netdev, void *p)
>   		return -EADDRNOTAVAIL;
>   
>   	memcpy(req.mac_addr, addr->sa_data, netdev->addr_len);
> -	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
> +	memcpy((void *)(netdev->dev_addr), addr->sa_data, netdev->addr_len);

I don't understand why the change is needed and the patch description
does not shed any light on it.

>   
>   	ret = kni_net_process_request(netdev, &req);
>   


  parent reply	other threads:[~2022-05-31 16:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-21  7:06 Min Hu (Connor)
2022-05-23  8:43 ` Ferruh Yigit
2022-05-31 16:42 ` Andrew Rybchenko [this message]
2022-06-01  1:52   ` Min Hu (Connor)
2022-06-01  8:47     ` Andrew Rybchenko
2022-06-01 15:49       ` Ferruh Yigit

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=b11ce44c-d6f7-c35f-b80b-05bbe2736a37@oktetlabs.ru \
    --to=andrew.rybchenko@oktetlabs.ru \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=helin.zhang@intel.com \
    --cc=humin29@huawei.com \
    --cc=stable@dpdk.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).