diff for duplicates of <878wvhtynu.wl%ysato@users.sourceforge.jp> diff --git a/a/1.txt b/N1/1.txt index b38b1c1..e79654a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ index 6a06b95..9661e2d 100644 - txdesc->status = cpu_to_le32(TD_TFP); + txdesc->status = cpu_to_edmac(TD_TFP); txdesc->buffer_length = 0; - if (i = 0) { + if (i == 0) { /* Rx descriptor address set */ @@ -287,7 +287,7 @@ static void sh_eth_ring_format(struct net_device *ndev) ctrl_outl(0x1, ioaddr + TDFFR); @@ -115,10 +115,12 @@ index 6a06b95..9661e2d 100644 @@ -552,10 +552,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(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(RD_RACT | RD_RFP); } diff --git a/a/content_digest b/N1/content_digest index c303182..7fff80b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Yoshinori Sato <ysato@users.sourceforge.jp>\0" "Subject\0[PATCH] sh_eth Add SH7619 support\0" - "Date\0Thu, 31 Jul 2008 23:35:33 +0000\0" + "Date\0Thu, 31 Jul 2008 19:35:33 -0400\0" "To\0Jeff Garzik <jeff@garzik.org>" " Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" "Cc\0netdev@vger.kernel.org" @@ -69,7 +69,7 @@ "-\t\ttxdesc->status = cpu_to_le32(TD_TFP);\n" "+\t\ttxdesc->status = cpu_to_edmac(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" "@@ -287,7 +287,7 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" " \tctrl_outl(0x1, ioaddr + TDFFR);\n" @@ -124,10 +124,12 @@ "@@ -552,10 +552,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(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(RD_RACT | RD_RFP);\n" " \t}\n" " \n" @@ -246,4 +248,4 @@ "Yoshinori Sato\n" <ysato@users.sourceforge.jp> -b00772e9d7481f033c73e411be0b51c14eb943e06d046d64c0adaa6c31b5e0d7 +f216f730b415504db223de853b8d013de82e651c16364651f394dde3e4301711
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.