diff for duplicates of <567F1E21.2040900@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 9af70f3..9c159fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,8 @@ On 12/26/2015 02:26 PM, Yoshihiro Kaneko wrote: >>> --- a/drivers/net/ethernet/renesas/ravb.h >>> +++ b/drivers/net/ethernet/renesas/ravb.h [...] ->>> @@ -1223,23 +1343,68 @@ static const struct ethtool_ops ravb_ethtool_ops >>> { +>>> @@ -1223,23 +1343,68 @@ static const struct ethtool_ops ravb_ethtool_ops = +>>> { >>> static int ravb_open(struct net_device *ndev) >>> { >>> struct ravb_private *priv = netdev_priv(ndev); @@ -46,10 +47,10 @@ On 12/26/2015 02:26 PM, Yoshihiro Kaneko wrote: >>> - goto out_napi_off; >>> - } >>> - ->>> - if (priv->chip_id = RCAR_GEN3) { +>>> - if (priv->chip_id == RCAR_GEN3) { >>> - error = request_irq(priv->emac_irq, ravb_interrupt, >>> - IRQF_SHARED, ndev->name, ndev); ->>> + if (priv->chip_id = RCAR_GEN2) { +>>> + if (priv->chip_id == RCAR_GEN2) { >>> + error = request_irq(ndev->irq, ravb_interrupt, >>> IRQF_SHARED, >>> + ndev->name, ndev); diff --git a/a/content_digest b/N1/content_digest index 1f2a500..17cd80a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0CAH1o70JdmPDchbCnRjbt+SmW4juow+ConD96_BBv8u51-KEW6A@mail.gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH/RFC v2 net-next] ravb: Add dma queue interrupt support\0" - "Date\0Sat, 26 Dec 2015 23:09:21 +0000\0" + "Date\0Sun, 27 Dec 2015 02:09:21 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>\0" "Cc\0netdev@vger.kernel.org" David S. Miller <davem@davemloft.net> @@ -39,7 +39,8 @@ ">>> --- a/drivers/net/ethernet/renesas/ravb.h\n" ">>> +++ b/drivers/net/ethernet/renesas/ravb.h\n" "[...]\n" - ">>> @@ -1223,23 +1343,68 @@ static const struct ethtool_ops ravb_ethtool_ops >>> {\n" + ">>> @@ -1223,23 +1343,68 @@ static const struct ethtool_ops ravb_ethtool_ops =\n" + ">>> {\n" ">>> static int ravb_open(struct net_device *ndev)\n" ">>> {\n" ">>> struct ravb_private *priv = netdev_priv(ndev);\n" @@ -60,10 +61,10 @@ ">>> - goto out_napi_off;\n" ">>> - }\n" ">>> -\n" - ">>> - if (priv->chip_id = RCAR_GEN3) {\n" + ">>> - if (priv->chip_id == RCAR_GEN3) {\n" ">>> - error = request_irq(priv->emac_irq, ravb_interrupt,\n" ">>> - IRQF_SHARED, ndev->name, ndev);\n" - ">>> + if (priv->chip_id = RCAR_GEN2) {\n" + ">>> + if (priv->chip_id == RCAR_GEN2) {\n" ">>> + error = request_irq(ndev->irq, ravb_interrupt,\n" ">>> IRQF_SHARED,\n" ">>> + ndev->name, ndev);\n" @@ -198,4 +199,4 @@ "\n" MBR, Sergei -11317dbb1671ee54aeeff0030f86e0c38ca0cc3ce52cec5bd5362c401aa130a5 +111ca68dd718a58fb0a756ad92ec3c3d5888d19e8885afed3bf8bc141a0be4e4
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.