diff for duplicates of <4FC48586.8070508@renesas.com> diff --git a/a/1.txt b/N1/1.txt index e33e892..5f313aa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -214,7 +214,8 @@ index ff5a4a9..c64a31c 100644 } - if (entry >= RX_RING_SIZE - 1) + if (entry >= mdp->num_rx_ring - 1) - rxdesc->status | cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL); + rxdesc->status |= + cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL); else @@ -1509,6 +1513,71 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data) } @@ -366,7 +367,7 @@ index ff5a4a9..c64a31c 100644 + mdp->num_tx_ring = TX_RING_SIZE; + mdp->num_rx_ring = RX_RING_SIZE; mdp->addr = ioremap(res->start, resource_size(res)); - if (mdp->addr = NULL) { + if (mdp->addr == NULL) { ret = -ENOMEM; diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index 9525199..f1dbc27 100644 diff --git a/a/content_digest b/N1/content_digest index 6def4c7..61efe63 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH v5 5/6] net: sh_eth: add support for set_ringparam/get_ringparam\0" - "Date\0Tue, 29 May 2012 08:15:02 +0000\0" + "Date\0Tue, 29 May 2012 17:15:02 +0900\0" "To\0netdev <netdev@vger.kernel.org>\0" "Cc\0SH-Linux <linux-sh@vger.kernel.org>\0" "\00:1\0" @@ -221,7 +221,8 @@ " \t\t}\n" "-\t\tif (entry >= RX_RING_SIZE - 1)\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_RDEL);\n" + " \t\t\trxdesc->status |=\n" + " \t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL);\n" " \t\telse\n" "@@ -1509,6 +1513,71 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)\n" " \t}\n" @@ -373,7 +374,7 @@ "+\tmdp->num_tx_ring = TX_RING_SIZE;\n" "+\tmdp->num_rx_ring = RX_RING_SIZE;\n" " \tmdp->addr = ioremap(res->start, resource_size(res));\n" - " \tif (mdp->addr = NULL) {\n" + " \tif (mdp->addr == NULL) {\n" " \t\tret = -ENOMEM;\n" "diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h\n" "index 9525199..f1dbc27 100644\n" @@ -402,4 +403,4 @@ "-- \n" 1.7.1 -fbb6de41e1fdb68e63ca40c500af5a62b29bf28f06dec1d7f45839ddabb07069 +5e0bb53af8068a55ce8881df62f0a307057c7190014fa711c8d0dd53fe2ff490
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.