From: Christoph Hellwig <hch@lst.de>
To: jgarzik@pobox.com
Cc: netdev@oss.sgi.com
Subject: [PATCH] fix compiler warnings in mv64340_eth
Date: Tue, 6 Jul 2004 12:52:15 +0200 [thread overview]
Message-ID: <20040706105215.GA14731@lst.de> (raw)
The driver was trying to do pointer arithmetic on integers but forgot
half of the casts..
Let's just do normal integer arithmetics instead.
--- drivers/net/mv64340_eth.c~ 2004-07-06 14:26:47.163242160 +0200
+++ drivers/net/mv64340_eth.c 2004-07-06 14:48:31.053020784 +0200
@@ -752,9 +752,8 @@
p_rx_desc[i].byte_cnt = 0x0000;
p_rx_desc[i].cmd_sts =
ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
- p_rx_desc[i].next_desc_ptr =
- (struct eth_rx_desc *) mp->rx_desc_dma +
- (i + 1) % rx_desc_num;
+ p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
+ ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
p_rx_desc[i].buf_ptr = buffer_addr;
mp->rx_skb[i] = NULL;
@@ -818,9 +817,8 @@
p_tx_desc[i].byte_cnt = 0x0000;
p_tx_desc[i].l4i_chk = 0x0000;
p_tx_desc[i].cmd_sts = 0x00000000;
- p_tx_desc[i].next_desc_ptr =
- (struct eth_tx_desc *) mp->tx_desc_dma +
- (i + 1) % tx_desc_num;
+ p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
+ ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
p_tx_desc[i].buf_ptr = 0x00000000;
mp->tx_skb[i] = NULL;
}
@@ -2329,8 +2349,8 @@
first_descriptor->cmd_sts = command_status;
first_descriptor->byte_cnt = p_pkt_info->byte_cnt;
first_descriptor->buf_ptr = p_pkt_info->buf_ptr;
- first_descriptor->next_desc_ptr =
- (struct eth_tx_desc *) mp->tx_desc_dma + tx_next_desc;
+ first_descriptor->next_desc_ptr = mp->tx_desc_dma +
+ tx_next_desc * sizeof(struct eth_tx_desc);
wmb();
} else {
tx_first_desc = mp->tx_first_desc_q;
@@ -2343,8 +2363,8 @@
current_descriptor->next_desc_ptr = 0x00000000;
else {
command_status |= ETH_BUFFER_OWNED_BY_DMA;
- current_descriptor->next_desc_ptr =
- (struct eth_tx_desc *) mp->tx_desc_dma + tx_next_desc;
+ current_descriptor->next_desc_ptr = mp->tx_desc_dma +
+ tx_next_desc * sizeof(struct eth_tx_desc);
}
}
next reply other threads:[~2004-07-06 10:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-06 10:52 Christoph Hellwig [this message]
2004-07-07 5:08 ` [PATCH] fix compiler warnings in mv64340_eth Jeff Garzik
2004-07-07 15:16 ` Christoph Hellwig
2004-07-09 19:19 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040706105215.GA14731@lst.de \
--to=hch@lst.de \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.