diff for duplicates of <7645144.Pie2WFS3t2@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 82f6739..f25e6b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 1 file changed, 29 insertions(+), 43 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 @@ -967,18 +967,6 @@ static void sh_eth_set_receive_align(str skb_reserve(skb, SH_ETH_RX_ALIGN - reserve); @@ -49,7 +50,7 @@ Index: net-next/drivers/net/ethernet/renesas/sh_eth.c + rxdesc->status = cpu_to_le32(RD_RACT | RD_RFP); /* Rx descriptor address set */ - if (i = 0) { + if (i == 0) { @@ -1175,7 +1163,7 @@ static void sh_eth_ring_format(struct ne mdp->dirty_rx = (u32) (i - mdp->num_rx_ring); @@ -67,7 +68,7 @@ Index: net-next/drivers/net/ethernet/renesas/sh_eth.c - txdesc->len = cpu_to_edmac(mdp, 0); + txdesc->status = cpu_to_le32(TD_TFP); + txdesc->len = cpu_to_le32(0); - if (i = 0) { + if (i == 0) { /* Tx descriptor address set */ sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR); @@ -1194,7 +1182,7 @@ static void sh_eth_ring_format(struct ne @@ -156,7 +157,7 @@ Index: net-next/drivers/net/ethernet/renesas/sh_eth.c - rxdesc->len = cpu_to_edmac(mdp, buf_len << 16); + rxdesc->len = cpu_to_le32(buf_len << 16); - if (mdp->rx_skbuff[entry] = NULL) { + if (mdp->rx_skbuff[entry] == NULL) { skb = netdev_alloc_skb(ndev, skbuff_size); @@ -1515,15 +1502,14 @@ static int sh_eth_rx(struct net_device * mdp->rx_skbuff[entry] = skb; @@ -167,10 +168,12 @@ Index: net-next/drivers/net/ethernet/renesas/sh_eth.c } 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); + cpu_to_le32(RD_RACT | RD_RFP | RD_RDLE); else -- rxdesc->status |- cpu_to_edmac(mdp, RD_RACT | RD_RFP); +- rxdesc->status |= +- cpu_to_edmac(mdp, RD_RACT | RD_RFP); + rxdesc->status |= cpu_to_le32(RD_RACT | RD_RFP); } diff --git a/a/content_digest b/N1/content_digest index 9e9afaf..9d1ecc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\027915743.MLN0FvErP3@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH 2/2] sh_eth: get rid of {cpu|edmac}_to_{edmac|cpu}()\0" - "Date\0Sun, 27 Dec 2015 23:10:47 +0000\0" + "Date\0Mon, 28 Dec 2015 02:10:47 +0300\0" "To\0netdev@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org\0" "\00:1\0" @@ -17,7 +17,8 @@ " 1 file changed, 29 insertions(+), 43 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" "@@ -967,18 +967,6 @@ static void sh_eth_set_receive_align(str\n" " \t\tskb_reserve(skb, SH_ETH_RX_ALIGN - reserve);\n" @@ -57,7 +58,7 @@ "+\t\trxdesc->status = cpu_to_le32(RD_RACT | RD_RFP);\n" " \n" " \t\t/* Rx descriptor address set */\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" "@@ -1175,7 +1163,7 @@ static void sh_eth_ring_format(struct ne\n" " \tmdp->dirty_rx = (u32) (i - mdp->num_rx_ring);\n" " \n" @@ -75,7 +76,7 @@ "-\t\ttxdesc->len = cpu_to_edmac(mdp, 0);\n" "+\t\ttxdesc->status = cpu_to_le32(TD_TFP);\n" "+\t\ttxdesc->len = cpu_to_le32(0);\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" " \t\t\t/* Tx descriptor address set */\n" " \t\t\tsh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);\n" "@@ -1194,7 +1182,7 @@ static void sh_eth_ring_format(struct ne\n" @@ -164,7 +165,7 @@ "-\t\trxdesc->len = cpu_to_edmac(mdp, buf_len << 16);\n" "+\t\trxdesc->len = cpu_to_le32(buf_len << 16);\n" " \n" - " \t\tif (mdp->rx_skbuff[entry] = NULL) {\n" + " \t\tif (mdp->rx_skbuff[entry] == NULL) {\n" " \t\t\tskb = netdev_alloc_skb(ndev, skbuff_size);\n" "@@ -1515,15 +1502,14 @@ static int sh_eth_rx(struct net_device *\n" " \t\t\tmdp->rx_skbuff[entry] = skb;\n" @@ -175,10 +176,12 @@ " \t\t}\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" "+\t\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RD_RDLE);\n" " \t\telse\n" - "-\t\t\trxdesc->status |-\t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP);\n" + "-\t\t\trxdesc->status |=\n" + "-\t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP);\n" "+\t\t\trxdesc->status |= cpu_to_le32(RD_RACT | RD_RFP);\n" " \t}\n" " \n" @@ -213,4 +216,4 @@ " \n" " \tmdp->cur_tx++;" -be852fe15613af260341fa7735046e568b9f868827d036db179dbfe576b6518c +7a9bbb1013e76cb36590c2db5d40de8b61f031f037a66ae8ec10516f63ad8169
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.