diff for duplicates of <87k5etzour.wl%ysato@users.sourceforge.jp> diff --git a/a/1.txt b/N1/1.txt index 34a2324..58e7961 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -105,7 +105,7 @@ index 6a06b95..25e62cf 100644 - txdesc->status = cpu_to_le32(TD_TFP); + txdesc->status = cpu_to_edmac(mdp, TD_TFP); txdesc->buffer_length = 0; - if (i = 0) { + if (i == 0) { - /* Rx descriptor address set */ + /* Tx descriptor address set */ ctrl_outl((u32)txdesc, ioaddr + TDLAR); @@ -171,10 +171,12 @@ index 6a06b95..25e62cf 100644 @@ -552,10 +575,10 @@ static int sh_eth_rx(struct net_device *ndev) } if (entry >= RX_RING_SIZE - 1) - rxdesc->status |- cpu_to_le32(RD_RACT | RD_RFP | RD_RDEL); + rxdesc->status |= +- cpu_to_le32(RD_RACT | RD_RFP | RD_RDEL); + cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL); else - rxdesc->status |- cpu_to_le32(RD_RACT | RD_RFP); + rxdesc->status |= +- cpu_to_le32(RD_RACT | RD_RFP); + cpu_to_edmac(mdp, RD_RACT | RD_RFP); } diff --git a/a/content_digest b/N1/content_digest index 276c226..debc62c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,7 +8,7 @@ "ref\029ab51dc0808060038g429bed14q4f41ef654def2a0@mail.gmail.com\0" "From\0Yoshinori Sato <ysato@users.sourceforge.jp>\0" "Subject\0Re: [PATCH 1/2] sh_eth Add SH7619 support (driver)\0" - "Date\0Wed, 06 Aug 2008 23:49:00 +0000\0" + "Date\0Wed, 06 Aug 2008 19:49:00 -0400\0" "To\0Jeff Garzik <jeff@garzik.org>" " Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" @@ -124,7 +124,7 @@ "-\t\ttxdesc->status = cpu_to_le32(TD_TFP);\n" "+\t\ttxdesc->status = cpu_to_edmac(mdp, TD_TFP);\n" " \t\ttxdesc->buffer_length = 0;\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" "-\t\t\t/* Rx descriptor address set */\n" "+\t\t\t/* Tx descriptor address set */\n" " \t\t\tctrl_outl((u32)txdesc, ioaddr + TDLAR);\n" @@ -190,10 +190,12 @@ "@@ -552,10 +575,10 @@ static int sh_eth_rx(struct net_device *ndev)\n" " \t\t}\n" " \t\tif (entry >= RX_RING_SIZE - 1)\n" - " \t\t\trxdesc->status |-\t\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RD_RDEL);\n" + " \t\t\trxdesc->status |=\n" + "-\t\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RD_RDEL);\n" "+\t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL);\n" " \t\telse\n" - " \t\t\trxdesc->status |-\t\t\t\tcpu_to_le32(RD_RACT | RD_RFP);\n" + " \t\t\trxdesc->status |=\n" + "-\t\t\t\tcpu_to_le32(RD_RACT | RD_RFP);\n" "+\t\t\t\tcpu_to_edmac(mdp, RD_RACT | RD_RFP);\n" " \t}\n" " \n" @@ -354,4 +356,4 @@ "Yoshinori Sato\n" <ysato@users.sourceforge.jp> -4f7ef26eb55d06ec091799439f07db9e3e45a8bb004ed38ff46ad59d11f27378 +3be2c83305e04e2380e30c6f655d653427d3b3e073fb557f206c36ece6cfb1fd
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.