| Message ID | 1c27abb938a430e58bd644729597015b3414d4aa.1617540100.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1ec3d02f9cdf2a4b89664145c7965aa46398d31e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
> -----Original Message----- > From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Sent: Sunday, April 4, 2021 6:13 PM > To: Ariel Elior <aelior@marvell.com>; GR-everest-linux-l2 <GR-everest-linux- > l2@marvell.com>; davem@davemloft.net; kuba@kernel.org > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; kernel- > janitors@vger.kernel.org; Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Subject: [EXT] [PATCH 1/2] qede: Remove a erroneous ++ in > 'qede_rx_build_jumbo()' > > External Email > > ---------------------------------------------------------------------- > This ++ is confusing. It looks duplicated with the one already performed in > 'skb_fill_page_desc()'. > > In fact, it is harmless. 'nr_frags' is written twice with the same value. > Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1' > in 'skb_fill_page_desc()'. > > So axe this post-increment to avoid confusion. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/net/ethernet/qlogic/qede/qede_fp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c > b/drivers/net/ethernet/qlogic/qede/qede_fp.c > index 102d0e0808d5..ee3e45e38cb7 100644 > --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c > +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c > @@ -1209,7 +1209,7 @@ static int qede_rx_build_jumbo(struct qede_dev > *edev, > dma_unmap_page(rxq->dev, bd->mapping, > PAGE_SIZE, DMA_FROM_DEVICE); > > - skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags++, > + skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags, > bd->data, rxq->rx_headroom, cur_size); > > skb->truesize += PAGE_SIZE; > -- > 2.27.0 Acked-by: Manish Chopra <manishc@marvell.com>
Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Sun, 4 Apr 2021 14:42:44 +0200 you wrote: > This ++ is confusing. It looks duplicated with the one already performed in > 'skb_fill_page_desc()'. > > In fact, it is harmless. 'nr_frags' is written twice with the same value. > Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1' > in 'skb_fill_page_desc()'. > > [...] Here is the summary with links: - [1/2] qede: Remove a erroneous ++ in 'qede_rx_build_jumbo()' https://git.kernel.org/netdev/net-next/c/1ec3d02f9cdf - [2/2] qede: Use 'skb_add_rx_frag()' instead of hand coding it https://git.kernel.org/netdev/net-next/c/7190e9d8e131 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index 102d0e0808d5..ee3e45e38cb7 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -1209,7 +1209,7 @@ static int qede_rx_build_jumbo(struct qede_dev *edev, dma_unmap_page(rxq->dev, bd->mapping, PAGE_SIZE, DMA_FROM_DEVICE); - skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags++, + skb_fill_page_desc(skb, skb_shinfo(skb)->nr_frags, bd->data, rxq->rx_headroom, cur_size); skb->truesize += PAGE_SIZE;
This ++ is confusing. It looks duplicated with the one already performed in 'skb_fill_page_desc()'. In fact, it is harmless. 'nr_frags' is written twice with the same value. Once, because of the nr_frags++, and once because of the 'nr_frags = i + 1' in 'skb_fill_page_desc()'. So axe this post-increment to avoid confusion. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/ethernet/qlogic/qede/qede_fp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)