diff for duplicates of <56706330.2060803@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index dc853c9..637c013 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -124,7 +124,7 @@ manual. So, your _ALL isn't really "all bits". > - ravb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2); > - /* Frame transmitted, timestamp FIFO updated */ > - ravb_write(ndev, TIC_FTE0 | TIC_FTE1 | TIC_TFUE, TIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + /* Frame receive */ > + ravb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0); > + /* Disable FIFO full warning */ @@ -174,7 +174,7 @@ correct... :-) > if (eis & EIS_QFS) { > ris2 = ravb_read(ndev, RIS2); > - ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2); -> + if (priv->chip_id = RCAR_GEN2) +> + if (priv->chip_id == RCAR_GEN2) > + ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2); > + else > + ravb_write(ndev, RIS2_QFF0 | RIS2_RFFF, RID2); @@ -220,7 +220,7 @@ correct... :-) > spin_lock_irqsave(&priv->lock, flags); > - ravb_write(ndev, ravb_read(ndev, RIC0) | mask, RIC0); > - ravb_write(ndev, ravb_read(ndev, TIC) | mask, TIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + ravb_write(ndev, ravb_read(ndev, RIC0) | mask, RIC0); > + ravb_write(ndev, ravb_read(ndev, TIC) | mask, TIC); @@ -259,7 +259,7 @@ correct... :-) > - else > - gic &= ~GIC_PTCE; > - ravb_write(ndev, gic, GIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + if (on) > + gic |= GIC_PTCE; > + else @@ -278,7 +278,7 @@ correct... :-) > - gic = ravb_read(ndev, GIC); > - gic |= GIC_PTME; > - ravb_write(ndev, gic, GIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + gic = ravb_read(ndev, GIC); > + gic |= GIC_PTME; > + ravb_write(ndev, gic, GIC); @@ -296,7 +296,7 @@ correct... :-) > - gic = ravb_read(ndev, GIC); > - gic &= ~GIC_PTME; > - ravb_write(ndev, gic, GIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + gic = ravb_read(ndev, GIC); > + gic &= ~GIC_PTME; > + ravb_write(ndev, gic, GIC); diff --git a/a/content_digest b/N1/content_digest index 6bb550c..a8b5b8d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01450182181-12575-1-git-send-email-ykaneko0929@gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH/RFC net-next] ravb: Add dma queue interrupt support\0" - "Date\0Tue, 15 Dec 2015 19:00:00 +0000\0" + "Date\0Tue, 15 Dec 2015 22:00:00 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>" " netdev@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" @@ -136,7 +136,7 @@ "> -\travb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2);\n" "> -\t/* Frame transmitted, timestamp FIFO updated */\n" "> -\travb_write(ndev, TIC_FTE0 | TIC_FTE1 | TIC_TFUE, TIC);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\t/* Frame receive */\n" "> +\t\travb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0);\n" "> +\t\t/* Disable FIFO full warning */\n" @@ -186,7 +186,7 @@ "> \tif (eis & EIS_QFS) {\n" "> \t\tris2 = ravb_read(ndev, RIS2);\n" "> -\t\travb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2);\n" - "> +\t\tif (priv->chip_id = RCAR_GEN2)\n" + "> +\t\tif (priv->chip_id == RCAR_GEN2)\n" "> +\t\t\travb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2);\n" "> +\t\telse\n" "> +\t\t\travb_write(ndev, RIS2_QFF0 | RIS2_RFFF, RID2);\n" @@ -232,7 +232,7 @@ "> \tspin_lock_irqsave(&priv->lock, flags);\n" "> -\travb_write(ndev, ravb_read(ndev, RIC0) | mask, RIC0);\n" "> -\travb_write(ndev, ravb_read(ndev, TIC) | mask, TIC);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\travb_write(ndev, ravb_read(ndev, RIC0) | mask, RIC0);\n" "> +\t\travb_write(ndev, ravb_read(ndev, TIC) | mask, TIC);\n" "\n" @@ -271,7 +271,7 @@ "> -\telse\n" "> -\t\tgic &= ~GIC_PTCE;\n" "> -\travb_write(ndev, gic, GIC);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\tif (on)\n" "> +\t\t\tgic |= GIC_PTCE;\n" "> +\t\telse\n" @@ -290,7 +290,7 @@ "> -\t\t\tgic = ravb_read(ndev, GIC);\n" "> -\t\t\tgic |= GIC_PTME;\n" "> -\t\t\travb_write(ndev, gic, GIC);\n" - "> +\t\t\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\t\t\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\t\t\tgic = ravb_read(ndev, GIC);\n" "> +\t\t\t\tgic |= GIC_PTME;\n" "> +\t\t\t\travb_write(ndev, gic, GIC);\n" @@ -308,7 +308,7 @@ "> -\t\tgic = ravb_read(ndev, GIC);\n" "> -\t\tgic &= ~GIC_PTME;\n" "> -\t\travb_write(ndev, gic, GIC);\n" - "> +\t\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\t\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\t\tgic = ravb_read(ndev, GIC);\n" "> +\t\t\tgic &= ~GIC_PTME;\n" "> +\t\t\travb_write(ndev, gic, GIC);\n" @@ -322,4 +322,4 @@ "\n" MBR, Sergei -322a32546ab1df6309d6348a0022f549a0026448494c83cdd427a7e3033bee7f +e65a5102f98323968b643eb459193fc7ba30ebf82acfcbd364be8af57611ddd4
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.