diff for duplicates of <6916181.NMDRL3LUfS@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index a293b18..359f290 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,8 @@ Changes in version 2: 2 files changed, 64 insertions(+), 45 deletions(-) Index: net-next/drivers/net/ethernet/renesas/ravb.h -=================================--- net-next.orig/drivers/net/ethernet/renesas/ravb.h +=================================================================== +--- net-next.orig/drivers/net/ethernet/renesas/ravb.h +++ net-next/drivers/net/ethernet/renesas/ravb.h @@ -658,6 +658,8 @@ struct ravb_desc { __le32 dptr; /* Descriptor pointer */ @@ -53,7 +54,8 @@ Index: net-next/drivers/net/ethernet/renesas/ravb.h u32 rx_fifo_errors; struct net_device_stats stats[NUM_RX_QUEUE]; Index: net-next/drivers/net/ethernet/renesas/ravb_main.c -=================================--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c +=================================================================== +--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c +++ net-next/drivers/net/ethernet/renesas/ravb_main.c @@ -195,12 +195,8 @@ static void ravb_ring_free(struct net_de priv->tx_skb[q] = NULL; @@ -167,7 +169,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb_main.c - dev_kfree_skb_any(priv->tx_skb[q][entry]); - priv->tx_skb[q][entry] = NULL; + /* Last packet descriptor? */ -+ if (entry % NUM_TX_DESC = NUM_TX_DESC - 1) { ++ if (entry % NUM_TX_DESC == NUM_TX_DESC - 1) { + entry /= NUM_TX_DESC; + dev_kfree_skb_any(priv->tx_skb[q][entry]); + priv->tx_skb[q][entry] = NULL; @@ -231,7 +233,7 @@ Index: net-next/drivers/net/ethernet/renesas/ravb_main.c desc->dptr = cpu_to_le32(dma_addr); /* TX timestamp required */ - if (q = RAVB_NC) { + if (q == RAVB_NC) { ts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC); if (!ts_skb) { - dma_unmap_single(&ndev->dev, dma_addr, skb->len, diff --git a/a/content_digest b/N1/content_digest index 1eb3919..f57f8c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v2] ravb: minimize TX data copying\0" - "Date\0Sat, 25 Jul 2015 20:42:01 +0000\0" + "Date\0Sat, 25 Jul 2015 23:42:01 +0300\0" "To\0netdev@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org\0" "\00:1\0" @@ -29,7 +29,8 @@ " 2 files changed, 64 insertions(+), 45 deletions(-)\n" "\n" "Index: net-next/drivers/net/ethernet/renesas/ravb.h\n" - "=================================--- net-next.orig/drivers/net/ethernet/renesas/ravb.h\n" + "===================================================================\n" + "--- net-next.orig/drivers/net/ethernet/renesas/ravb.h\n" "+++ net-next/drivers/net/ethernet/renesas/ravb.h\n" "@@ -658,6 +658,8 @@ struct ravb_desc {\n" " \t__le32 dptr;\t/* Descriptor pointer */\n" @@ -60,7 +61,8 @@ " \tu32 rx_fifo_errors;\n" " \tstruct net_device_stats stats[NUM_RX_QUEUE];\n" "Index: net-next/drivers/net/ethernet/renesas/ravb_main.c\n" - "=================================--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c\n" + "===================================================================\n" + "--- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c\n" "+++ net-next/drivers/net/ethernet/renesas/ravb_main.c\n" "@@ -195,12 +195,8 @@ static void ravb_ring_free(struct net_de\n" " \tpriv->tx_skb[q] = NULL;\n" @@ -174,7 +176,7 @@ "-\t\t\tdev_kfree_skb_any(priv->tx_skb[q][entry]);\n" "-\t\t\tpriv->tx_skb[q][entry] = NULL;\n" "+\t\t\t/* Last packet descriptor? */\n" - "+\t\t\tif (entry % NUM_TX_DESC = NUM_TX_DESC - 1) {\n" + "+\t\t\tif (entry % NUM_TX_DESC == NUM_TX_DESC - 1) {\n" "+\t\t\t\tentry /= NUM_TX_DESC;\n" "+\t\t\t\tdev_kfree_skb_any(priv->tx_skb[q][entry]);\n" "+\t\t\t\tpriv->tx_skb[q][entry] = NULL;\n" @@ -238,7 +240,7 @@ " \tdesc->dptr = cpu_to_le32(dma_addr);\n" " \n" " \t/* TX timestamp required */\n" - " \tif (q = RAVB_NC) {\n" + " \tif (q == RAVB_NC) {\n" " \t\tts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC);\n" " \t\tif (!ts_skb) {\n" "-\t\t\tdma_unmap_single(&ndev->dev, dma_addr, skb->len,\n" @@ -284,4 +286,4 @@ " \tgoto exit;\n" } -0c9e664a50dece544826184f3c64ab19a948874a59e8488228c0f1b45bdd7bf2 +7c46c9e33b4112e98bf0b60b5cfc0b2c40553e003349ec0221192ed834476c32
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.