diff for duplicates of <479065E3.8010400@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 1e089fc..78ee47d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -246,7 +246,7 @@ diff -uprN a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c + mdp->rx_skbuff[i] = NULL; + skb = dev_alloc_skb(mdp->rx_buf_sz); + mdp->rx_skbuff[i] = skb; -+ if (skb = NULL) ++ if (skb == NULL) + break; + skb->dev = ndev; /* Mark as being used by this device. */ + skb_reserve(skb, RX_OFFSET); @@ -501,10 +501,10 @@ diff -uprN a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c + for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) { + entry = mdp->dirty_rx % RX_RING_SIZE; + rxdesc = &mdp->rx_ring[entry]; -+ if (mdp->rx_skbuff[entry] = NULL) { ++ if (mdp->rx_skbuff[entry] == NULL) { + skb = dev_alloc_skb(mdp->rx_buf_sz); + mdp->rx_skbuff[entry] = skb; -+ if (skb = NULL) ++ if (skb == NULL) + break; /* Better luck next round. */ + skb->dev = ndev; + skb_reserve(skb, RX_OFFSET); @@ -513,9 +513,11 @@ diff -uprN a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c + /* The size of the buffer is 16 byte boundary. */ + rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; + if (entry >= RX_RING_SIZE - 1) -+ rxdesc->status |+ cpu_to_le32(RD_RACT | RD_RFP | RC_RDEL); ++ rxdesc->status |= ++ cpu_to_le32(RD_RACT | RD_RFP | RC_RDEL); + else -+ rxdesc->status |+ cpu_to_le32(RD_RACT | RD_RFP); ++ rxdesc->status |= ++ cpu_to_le32(RD_RACT | RD_RFP); + } + + /* Restart Rx engine if stopped. */ @@ -685,7 +687,7 @@ diff -uprN a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c + new_state = 1; + mdp->speed = phydev->speed; + } -+ if (mdp->link = PHY_DOWN) { ++ if (mdp->link == PHY_DOWN) { + ctrl_outl((ctrl_inl(ioaddr + ECMR) & ~ECMR_TXF) + | ECMR_DM, ioaddr + ECMR); + new_state = 1; @@ -1087,7 +1089,7 @@ diff -uprN a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c + + /* get base addr */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (unlikely(res = NULL)) { ++ if (unlikely(res == NULL)) { + dev_err(&pdev->dev, "invalid resource\n"); + ret = -EINVAL; + goto out; diff --git a/a/content_digest b/N1/content_digest index 95ad912..5c4fba8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>\0" "Subject\0[PATCH] net: sh_eth: Add support for Renesas SuperH Ethernet\0" - "Date\0Fri, 18 Jan 2008 08:40:03 +0000\0" + "Date\0Fri, 18 Jan 2008 17:40:03 +0900\0" "To\0jgarzik@pobox.com\0" "Cc\0netdev@vger.kernel.org" " linux-sh@vger.kernel.org\0" @@ -254,7 +254,7 @@ "+\t\tmdp->rx_skbuff[i] = NULL;\n" "+\t\tskb = dev_alloc_skb(mdp->rx_buf_sz);\n" "+\t\tmdp->rx_skbuff[i] = skb;\n" - "+\t\tif (skb = NULL)\n" + "+\t\tif (skb == NULL)\n" "+\t\t\tbreak;\n" "+\t\tskb->dev = ndev;\t/* Mark as being used by this device. */\n" "+\t\tskb_reserve(skb, RX_OFFSET);\n" @@ -509,10 +509,10 @@ "+\tfor (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) {\n" "+\t\tentry = mdp->dirty_rx % RX_RING_SIZE;\n" "+\t\trxdesc = &mdp->rx_ring[entry];\n" - "+\t\tif (mdp->rx_skbuff[entry] = NULL) {\n" + "+\t\tif (mdp->rx_skbuff[entry] == NULL) {\n" "+\t\t\tskb = dev_alloc_skb(mdp->rx_buf_sz);\n" "+\t\t\tmdp->rx_skbuff[entry] = skb;\n" - "+\t\t\tif (skb = NULL)\n" + "+\t\t\tif (skb == NULL)\n" "+\t\t\t\tbreak;\t/* Better luck next round. */\n" "+\t\t\tskb->dev = ndev;\n" "+\t\t\tskb_reserve(skb, RX_OFFSET);\n" @@ -521,9 +521,11 @@ "+\t\t/* The size of the buffer is 16 byte boundary. */\n" "+\t\trxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F;\n" "+\t\tif (entry >= RX_RING_SIZE - 1)\n" - "+\t\t\trxdesc->status |+\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RC_RDEL);\n" + "+\t\t\trxdesc->status |=\n" + "+\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RC_RDEL);\n" "+\t\telse\n" - "+\t\t\trxdesc->status |+\t\t\tcpu_to_le32(RD_RACT | RD_RFP);\n" + "+\t\t\trxdesc->status |=\n" + "+\t\t\tcpu_to_le32(RD_RACT | RD_RFP);\n" "+\t}\n" "+\n" "+\t/* Restart Rx engine if stopped. */\n" @@ -693,7 +695,7 @@ "+\t\t\tnew_state = 1;\n" "+\t\t\tmdp->speed = phydev->speed;\n" "+\t\t}\n" - "+\t\tif (mdp->link = PHY_DOWN) {\n" + "+\t\tif (mdp->link == PHY_DOWN) {\n" "+\t\t\tctrl_outl((ctrl_inl(ioaddr + ECMR) & ~ECMR_TXF)\n" "+\t\t\t\t\t| ECMR_DM, ioaddr + ECMR);\n" "+\t\t\tnew_state = 1;\n" @@ -1095,7 +1097,7 @@ "+\n" "+\t/* get base addr */\n" "+\tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "+\tif (unlikely(res = NULL)) {\n" + "+\tif (unlikely(res == NULL)) {\n" "+\t\tdev_err(&pdev->dev, \"invalid resource\\n\");\n" "+\t\tret = -EINVAL;\n" "+\t\tgoto out;\n" @@ -1700,4 +1702,4 @@ "+\n" +#endif /* __SH_ETH_H__ */ -e20417a871ed7860a2ac2b9f7600124d695dccd092579c3f055b781590165cab +049946a7afeca355a6162f44ac6ebe4c5d6fdeda32874d7bb024fe4ddc67137a
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.