diff options
| author |   Aaro Koskinen <aaro.koskinen@nsn.com> | 2014-09-08 18:01:53 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-08 14:23:46 -0700 |
| commit | 208f7ca4d4a6886256763c9c073775c5fdaf47eb (patch) | |
| tree | f0e1c0a8facde4047650e51f3ddaf90526bb3598 /drivers/net/ethernet/octeon | |
| parent | net: fix skb_page_frag_refill() kerneldoc (diff) | |
| download | linux-dev-208f7ca4d4a6886256763c9c073775c5fdaf47eb.tar.xz linux-dev-208f7ca4d4a6886256763c9c073775c5fdaf47eb.zip | |
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: Aaro Koskinen <aaro.koskinen@nsn.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/octeon')
| -rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 979c6980639f..a42293092ea4 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -290,9 +290,11 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p) /* Read the hardware TX timestamp if one was recorded */ if (unlikely(re.s.tstamp)) { struct skb_shared_hwtstamps ts; + u64 ns; + memset(&ts, 0, sizeof(ts)); /* 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 */ cvmx_write_csr(CVMX_MIXX_TSCTL(p->port), 0); /* Tell the kernel about the timestamp */ |