diff for duplicates of <4A1A6A90.10909@renesas.com> diff --git a/a/1.txt b/N1/1.txt index dc062e3..d89bbc1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ index a742297..eb76835 100644 - rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; + rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16); /* Rx descriptor address set */ - if (i = 0) { + if (i == 0) { - ctrl_outl((u32)rxdesc, ioaddr + RDLAR); + ctrl_outl(mdp->rx_desc_dma, ioaddr + RDLAR); #if defined(CONFIG_CPU_SUBTYPE_SH7763) @@ -43,7 +43,7 @@ index a742297..eb76835 100644 /* Mark the last entry as wrapping the ring. */ @@ -298,19 +292,13 @@ static void sh_eth_ring_format(struct net_device *ndev) txdesc->buffer_length = 0; - if (i = 0) { + if (i == 0) { /* Tx descriptor address set */ - ctrl_outl((u32)txdesc, ioaddr + TDLAR); + ctrl_outl(mdp->tx_desc_dma, ioaddr + TDLAR); @@ -80,7 +80,7 @@ index a742297..eb76835 100644 - rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; + rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16); - if (mdp->rx_skbuff[entry] = NULL) { + if (mdp->rx_skbuff[entry] == NULL) { skb = dev_alloc_skb(mdp->rx_buf_sz); @@ -573,7 +562,7 @@ static int sh_eth_rx(struct net_device *ndev) skb_reserve(skb, RX_OFFSET); @@ -90,7 +90,8 @@ index a742297..eb76835 100644 + rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4)); } if (entry >= RX_RING_SIZE - 1) - rxdesc->status |@@ -959,9 +948,9 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) + rxdesc->status |= +@@ -959,9 +948,9 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) entry = mdp->cur_tx % TX_RING_SIZE; mdp->tx_skbuff[entry] = skb; txdesc = &mdp->tx_ring[entry]; diff --git a/a/content_digest b/N1/content_digest index d4717ee..f6515c4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>\0" "Subject\0[PATCH 2/5] net: sh_eth: fix TX/RX descriptor not set physical memory\0" - "Date\0Mon, 25 May 2009 09:53:20 +0000\0" + "Date\0Mon, 25 May 2009 18:53:20 +0900\0" "To\0netdev@vger.kernel.org\0" "Cc\0SH-Linux <linux-sh@vger.kernel.org>" " Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>\0" @@ -30,7 +30,7 @@ "-\t\trxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F;\n" "+\t\trxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);\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" "+\t\t\tctrl_outl(mdp->rx_desc_dma, ioaddr + RDLAR);\n" " #if defined(CONFIG_CPU_SUBTYPE_SH7763)\n" @@ -51,7 +51,7 @@ " \t/* Mark the last entry as wrapping the ring. */\n" "@@ -298,19 +292,13 @@ static void sh_eth_ring_format(struct net_device *ndev)\n" " \t\ttxdesc->buffer_length = 0;\n" - " \t\tif (i = 0) {\n" + " \t\tif (i == 0) {\n" " \t\t\t/* Tx descriptor address set */\n" "-\t\t\tctrl_outl((u32)txdesc, ioaddr + TDLAR);\n" "+\t\t\tctrl_outl(mdp->tx_desc_dma, ioaddr + TDLAR);\n" @@ -88,7 +88,7 @@ "-\t\trxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F;\n" "+\t\trxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);\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" "@@ -573,7 +562,7 @@ static int sh_eth_rx(struct net_device *ndev)\n" " \t\t\tskb_reserve(skb, RX_OFFSET);\n" @@ -98,7 +98,8 @@ "+\t\t\trxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));\n" " \t\t}\n" " \t\tif (entry >= RX_RING_SIZE - 1)\n" - " \t\t\trxdesc->status |@@ -959,9 +948,9 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)\n" + " \t\t\trxdesc->status |=\n" + "@@ -959,9 +948,9 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)\n" " \tentry = mdp->cur_tx % TX_RING_SIZE;\n" " \tmdp->tx_skbuff[entry] = skb;\n" " \ttxdesc = &mdp->tx_ring[entry];\n" @@ -113,4 +114,4 @@ "-- \n" 1.5.5 -10448f9b35ee612d99f80a257f10404170a08998bf335d659d15ad8ed2c7ccd4 +11bdf7b5c6fa95d698423c25f3224feb9001192071906fdfc2e539eb6ee5ed47
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.