diff for duplicates of <4759713.2ulGRKsd9L@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 57c2990..66d894b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ Don't know why I missed this DMA API misuse while working on the driver. :-< 1 file changed, 3 insertions(+), 7 deletions(-) Index: net/drivers/net/ethernet/renesas/ravb_main.c -=================================--- net.orig/drivers/net/ethernet/renesas/ravb_main.c +=================================================================== +--- net.orig/drivers/net/ethernet/renesas/ravb_main.c +++ net/drivers/net/ethernet/renesas/ravb_main.c @@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *n @@ -27,7 +28,7 @@ Index: net/drivers/net/ethernet/renesas/ravb_main.c + dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr), + ALIGN(PKT_BUF_SZ, 16), + DMA_FROM_DEVICE); - get_ts &= (q = RAVB_NC) ? + get_ts &= (q == RAVB_NC) ? RAVB_RXTSTAMP_TYPE_V2_L2_EVENT : ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT; @@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *n diff --git a/a/content_digest b/N1/content_digest index 3e7ad1c..c77b71c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ravb: do not invalidate cache for RX buffer twice\0" - "Date\0Tue, 14 Jul 2015 21:56:52 +0000\0" + "Date\0Wed, 15 Jul 2015 00:56:52 +0300\0" "To\0netdev@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org\0" "\00:1\0" @@ -21,7 +21,8 @@ " 1 file changed, 3 insertions(+), 7 deletions(-)\n" "\n" "Index: net/drivers/net/ethernet/renesas/ravb_main.c\n" - "=================================--- net.orig/drivers/net/ethernet/renesas/ravb_main.c\n" + "===================================================================\n" + "--- net.orig/drivers/net/ethernet/renesas/ravb_main.c\n" "+++ net/drivers/net/ethernet/renesas/ravb_main.c\n" "@@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *n\n" " \n" @@ -34,7 +35,7 @@ "+\t\t\tdma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),\n" "+\t\t\t\t\t ALIGN(PKT_BUF_SZ, 16),\n" "+\t\t\t\t\t DMA_FROM_DEVICE);\n" - " \t\t\tget_ts &= (q = RAVB_NC) ?\n" + " \t\t\tget_ts &= (q == RAVB_NC) ?\n" " \t\t\t\t\tRAVB_RXTSTAMP_TYPE_V2_L2_EVENT :\n" " \t\t\t\t\t~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;\n" "@@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *n\n" @@ -48,4 +49,4 @@ " \t\t\t\t\t\t le16_to_cpu(desc->ds_cc),\n" " \t\t\t\t\t\t DMA_FROM_DEVICE);" -ece4d0517c6d0c03aeecc60c29d8391713d28e71302657ad5549c5d6cda695f4 +3d3048dbcb07a0384a34b2660e59d2a66e8be773171a9efda8b3fc59349f6821
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.