diff for duplicates of <56CA0A68.2020709@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 90df988..7a71455 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -123,15 +123,15 @@ and should probably be routed to ch22. Sorry for not noticing this before... > @@ -1208,29 +1326,66 @@ static const struct ethtool_ops ravb_ethtool_ops = { [...] > @@ -1257,8 +1412,17 @@ out_ptp_stop: -> if (priv->chip_id = RCAR_GEN2) +> if (priv->chip_id == RCAR_GEN2) > ravb_ptp_stop(ndev); > out_free_irq2: Rename to 'out_free_irq_nc_tx' please. -> - if (priv->chip_id = RCAR_GEN3) +> - if (priv->chip_id == RCAR_GEN3) > - free_irq(priv->emac_irq, ndev); -> + if (priv->chip_id = RCAR_GEN2) +> + if (priv->chip_id == RCAR_GEN2) > + goto out_free_irq; @@ -161,7 +161,7 @@ and should probably be routed to ch22. Sorry for not noticing this before... > > spin_lock_irqsave(&priv->lock, flags); > - ravb_modify(ndev, GIC, GIC_PTCE, on ? GIC_PTCE : 0); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + ravb_modify(ndev, GIC, GIC_PTCE, on ? GIC_PTCE : 0); > + } else { > + if (on) diff --git a/a/content_digest b/N1/content_digest index 7a52fde..e7397a6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01455478769-16084-1-git-send-email-ykaneko0929@gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH/RFC v5 net-next] ravb: Add dma queue interrupt support\0" - "Date\0Sun, 21 Feb 2016 19:05:12 +0000\0" + "Date\0Sun, 21 Feb 2016 22:05:12 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>" " netdev@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" @@ -136,15 +136,15 @@ "> @@ -1208,29 +1326,66 @@ static const struct ethtool_ops ravb_ethtool_ops = {\n" "[...]\n" "> @@ -1257,8 +1412,17 @@ out_ptp_stop:\n" - "> \tif (priv->chip_id = RCAR_GEN2)\n" + "> \tif (priv->chip_id == RCAR_GEN2)\n" "> \t\travb_ptp_stop(ndev);\n" "> out_free_irq2:\n" "\n" " Rename to 'out_free_irq_nc_tx' please.\n" "\n" - "> -\tif (priv->chip_id = RCAR_GEN3)\n" + "> -\tif (priv->chip_id == RCAR_GEN3)\n" "> -\t\tfree_irq(priv->emac_irq, ndev);\n" - "> +\tif (priv->chip_id = RCAR_GEN2)\n" + "> +\tif (priv->chip_id == RCAR_GEN2)\n" "> +\t\tgoto out_free_irq;\n" "\n" "\n" @@ -174,7 +174,7 @@ ">\n" "> \tspin_lock_irqsave(&priv->lock, flags);\n" "> -\travb_modify(ndev, GIC, GIC_PTCE, on ? GIC_PTCE : 0);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\travb_modify(ndev, GIC, GIC_PTCE, on ? GIC_PTCE : 0);\n" "> +\t} else {\n" "> +\t\tif (on)\n" @@ -193,4 +193,4 @@ "\n" MBR, Sergei -53c22fe71ef53139e3b741a86a94067209d59dd4bcb68c5ca973d4da3f7bb584 +086793ff3176b24c6e848e9aecccbf1901ccd706598e629f4094993f004cb0b5
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.