diff for duplicates of <2178116.o4gdOMzEUc@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 5e6ce23..ad31d9b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ The patch is against DaveM's 'net-next.git' repo. 1 file changed, 4 insertions(+), 4 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c -=================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +=================================================================== +--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1416,7 +1416,7 @@ static int sh_eth_txfree(struct net_devi if (txdesc->status & cpu_to_edmac(mdp, TD_TACT)) @@ -38,7 +39,8 @@ Index: net-next/drivers/net/ethernet/renesas/sh_eth.c - wmb(); /* RACT bit must be set after all the above writes */ + dma_wmb(); /* RACT bit must be set after all the above writes */ if (entry >= mdp->num_rx_ring - 1) - rxdesc->status | cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE); + rxdesc->status |= + cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE); @@ -2403,7 +2403,7 @@ static int sh_eth_start_xmit(struct sk_b } txdesc->buffer_length = skb->len; diff --git a/a/content_digest b/N1/content_digest index 09ebf0e..18cfe43 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\02943003.kyUQtQdRCT@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] sh_eth: fix typo in RX descriptor bit name\0" - "Date\0Tue, 03 Nov 2015 19:20:05 +0000\0" + "Date\0Tue, 03 Nov 2015 22:20:05 +0300\0" "To\0netdev@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org\0" "\00:1\0" @@ -19,7 +18,8 @@ " 1 file changed, 4 insertions(+), 4 deletions(-)\n" "\n" "Index: net-next/drivers/net/ethernet/renesas/sh_eth.c\n" - "=================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c\n" + "===================================================================\n" + "--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c\n" "+++ net-next/drivers/net/ethernet/renesas/sh_eth.c\n" "@@ -1416,7 +1416,7 @@ static int sh_eth_txfree(struct net_devi\n" " \t\tif (txdesc->status & cpu_to_edmac(mdp, TD_TACT))\n" @@ -46,7 +46,8 @@ "-\t\twmb(); /* RACT bit must be set after all the above writes */\n" "+\t\tdma_wmb(); /* RACT bit must be set after all the above writes */\n" " \t\tif (entry >= mdp->num_rx_ring - 1)\n" - " \t\t\trxdesc->status | \t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);\n" + " \t\t\trxdesc->status |=\n" + " \t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);\n" "@@ -2403,7 +2403,7 @@ static int sh_eth_start_xmit(struct sk_b\n" " \t}\n" " \ttxdesc->buffer_length = skb->len;\n" @@ -57,4 +58,4 @@ " \t\ttxdesc->status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);\n" " \telse" -5c92fb39ff951deb98ec5afe9603240e6ed076645b0adbeaf044e59a939473ec +8e4bac479d807064af85072801d6baad1e34e82ab525568c31470947b3d73c57
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.