diff for duplicates of <48684011.5020201@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 3d455ed..1644652 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -116,7 +116,7 @@ index 37f3116..99557ea 100644 struct sk_buff *skb; @@ -201,9 +228,15 @@ static void sh_eth_ring_format(struct net_device *ndev) mdp->rx_skbuff[i] = skb; - if (skb = NULL) + if (skb == NULL) break; - skb->dev = ndev; /* Mark as being used by this device. */ + skb->dev = ndev; /* Mark as being used by this device. */ @@ -137,7 +137,7 @@ index 37f3116..99557ea 100644 /* The size of the buffer is 16 byte boundary. */ rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; + /* Rx descriptor address set */ -+ if (i = 0) { ++ if (i == 0) { + ctrl_outl((u32)rxdesc, ioaddr + RDLAR); +#if defined(CONFIG_CPU_SUBTYPE_SH7763) + ctrl_outl((u32)rxdesc, ioaddr + RDFAR); @@ -163,7 +163,7 @@ index 37f3116..99557ea 100644 txdesc = &mdp->tx_ring[i]; txdesc->status = cpu_to_le32(TD_TFP); txdesc->buffer_length = 0; -+ if (i = 0) { ++ if (i == 0) { + /* Rx descriptor address set */ + ctrl_outl((u32)txdesc, ioaddr + TDLAR); +#if defined(CONFIG_CPU_SUBTYPE_SH7763) @@ -280,10 +280,10 @@ index 37f3116..99557ea 100644 + /* The size of the buffer is 16 byte boundary. */ + rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; + - 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; +#if defined(CONFIG_CPU_SUBTYPE_SH7763) @@ -300,10 +300,12 @@ index 37f3116..99557ea 100644 - /* 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); + cpu_to_le32(RD_RACT | RD_RFP | RD_RDEL); else - rxdesc->status |- cpu_to_le32(RD_RACT | RD_RFP); + rxdesc->status |= +- cpu_to_le32(RD_RACT | RD_RFP); + cpu_to_le32(RD_RACT | RD_RFP); } @@ -405,7 +407,7 @@ index 37f3116..99557ea 100644 + } +#endif } - if (mdp->link = PHY_DOWN) { + if (mdp->link == PHY_DOWN) { ctrl_outl((ctrl_inl(ioaddr + ECMR) & ~ECMR_TXF) @@ -735,7 +852,7 @@ static int sh_eth_open(struct net_device *ndev) /* Set the timer to check for link beat. */ diff --git a/a/content_digest b/N1/content_digest index 0201b7f..b87ffcb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\04864840A.3060003@garzik.org\0" "From\0Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" "Subject\0[PATCH v3] net: sh_eth: Add support of SH7763 to sh_eth\0" - "Date\0Mon, 30 Jun 2008 02:08:17 +0000\0" + "Date\0Mon, 30 Jun 2008 11:08:17 +0900\0" "To\0Jeff Garzik <jeff@garzik.org>\0" "Cc\0netdev <netdev@vger.kernel.org>" Nobuhiro Iwamatsu <iwamatsu@nigauri.org> @@ -128,7 +128,7 @@ " \tstruct sk_buff *skb;\n" "@@ -201,9 +228,15 @@ static void sh_eth_ring_format(struct net_device *ndev)\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->dev = ndev; /* Mark as being used by this device. */\n" @@ -149,7 +149,7 @@ " \t\t/* The size of the buffer is 16 byte boundary. */\n" " \t\trxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F;\n" "+\t\t/* Rx descriptor address set */\n" - "+\t\tif (i = 0) {\n" + "+\t\tif (i == 0) {\n" "+\t\t\tctrl_outl((u32)rxdesc, ioaddr + RDLAR);\n" "+#if defined(CONFIG_CPU_SUBTYPE_SH7763)\n" "+\t\t\tctrl_outl((u32)rxdesc, ioaddr + RDFAR);\n" @@ -175,7 +175,7 @@ " \t\ttxdesc = &mdp->tx_ring[i];\n" " \t\ttxdesc->status = cpu_to_le32(TD_TFP);\n" " \t\ttxdesc->buffer_length = 0;\n" - "+\t\tif (i = 0) {\n" + "+\t\tif (i == 0) {\n" "+\t\t\t/* Rx descriptor address set */\n" "+\t\t\tctrl_outl((u32)txdesc, ioaddr + TDLAR);\n" "+#if defined(CONFIG_CPU_SUBTYPE_SH7763)\n" @@ -292,10 +292,10 @@ "+\t\t/* The size of the buffer is 16 byte boundary. */\n" "+\t\trxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F;\n" "+\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" "+#if defined(CONFIG_CPU_SUBTYPE_SH7763)\n" @@ -312,10 +312,12 @@ "-\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\t\t\tcpu_to_le32(RD_RACT | RD_RFP | RD_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\t\t\tcpu_to_le32(RD_RACT | RD_RFP);\n" " \t}\n" "\n" @@ -417,7 +419,7 @@ "+\t\t\t}\n" "+#endif\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" "@@ -735,7 +852,7 @@ static int sh_eth_open(struct net_device *ndev)\n" " \t/* Set the timer to check for link beat. */\n" @@ -1033,4 +1035,4 @@ "-- \n" 1.5.5.1 -64a055e6318a1b5f262b84371c11b74f1604545f328fff87743fc20bbca66fb0 +ad4f246415ed879762a68037280310043ee70111539a3ca1e38af0d23722bea5
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.