diff for duplicates of <4846334E.6070502@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 43a4a45..0bcd67c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -264,7 +264,7 @@ index 0000000..e45d585 + 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); @@ -519,10 +519,10 @@ index 0000000..e45d585 + 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); @@ -531,9 +531,11 @@ index 0000000..e45d585 + /* 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. */ @@ -701,7 +703,7 @@ index 0000000..e45d585 + 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; @@ -1101,7 +1103,7 @@ index 0000000..e45d585 + + /* 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 60c0c86..41d0318 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" "Subject\0[PATCH v3] net: sh_eth: Add support for Renesas SuperH Ethernet\0" - "Date\0Wed, 04 Jun 2008 06:16:46 +0000\0" + "Date\0Wed, 04 Jun 2008 15:16:46 +0900\0" "To\0netdev@vger.kernel.org\0" "Cc\0iwamatsu.nobuhiro@renesas.com" shimoda.yoshihiro@renesas.com @@ -274,7 +274,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" @@ -529,10 +529,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" @@ -541,9 +541,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" @@ -711,7 +713,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" @@ -1111,7 +1113,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" @@ -1719,4 +1721,4 @@ "-- \n" 1.5.5.1 -171cc6a09e5964b9628bd004f42ba89afd66e46f6df92f96133226baa3b5deff +3eebeb0708fff5a480ff17a91295816da70984a930018345e770c0252cb62a46
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.