Commit 208f7ca4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by David S. Miller

drivers: net: ethernet: octeon_mgmt: fix a compiler warning

Fix the following compiler warning:

drivers/net/ethernet/octeon/octeon_mgmt.c: In function 'octeon_mgmt_clean_tx_buffers':
drivers/net/ethernet/octeon/octeon_mgmt.c:295:4: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
    u64 ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port));
    ^
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nsn.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82d5e2b8
...@@ -290,9 +290,11 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p) ...@@ -290,9 +290,11 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
/* Read the hardware TX timestamp if one was recorded */ /* Read the hardware TX timestamp if one was recorded */
if (unlikely(re.s.tstamp)) { if (unlikely(re.s.tstamp)) {
struct skb_shared_hwtstamps ts; struct skb_shared_hwtstamps ts;
u64 ns;
memset(&ts, 0, sizeof(ts)); memset(&ts, 0, sizeof(ts));
/* Read the timestamp */ /* Read the timestamp */
u64 ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port)); ns = cvmx_read_csr(CVMX_MIXX_TSTAMP(p->port));
/* Remove the timestamp from the FIFO */ /* Remove the timestamp from the FIFO */
cvmx_write_csr(CVMX_MIXX_TSCTL(p->port), 0); cvmx_write_csr(CVMX_MIXX_TSCTL(p->port), 0);
/* Tell the kernel about the timestamp */ /* Tell the kernel about the timestamp */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment