diff for duplicates of <4FEAA163.2000305@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 3369c64..c9fc155 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -217,7 +217,8 @@ index 2dd2ff5..af0b867 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 @@ -1557,6 +1561,71 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data) } @@ -369,7 +370,7 @@ index 2dd2ff5..af0b867 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 37a0702..bae84fd 100644 diff --git a/a/content_digest b/N1/content_digest index 1f70a97..c519bc3 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 net-next 4/4 v2] net: sh_eth: add support for set_ringparam/get_ringparam\0" - "Date\0Wed, 27 Jun 2012 06:00:03 +0000\0" + "Date\0Wed, 27 Jun 2012 15:00:03 +0900\0" "To\0netdev <netdev@vger.kernel.org>\0" "Cc\0SH-Linux <linux-sh@vger.kernel.org>\0" "\00:1\0" @@ -224,7 +224,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" "@@ -1557,6 +1561,71 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)\n" " \t}\n" @@ -376,7 +377,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 37a0702..bae84fd 100644\n" @@ -405,4 +406,4 @@ "-- \n" 1.7.1 -458f73ba76adeeab4b6f22264bc19d97645cb6e3c9f701e2f89d4b30ae7505a9 +1e6fb799a314e55af83a742edf3174273c630b0a3114ecc4c31ba7a681401c3c
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.