From: Aaro Koskinen <aaro.koskinen@nsn.com>
To: netdev@vger.kernel.org, David Daney <david.daney@cavium.com>
Cc: Aaro Koskinen <aaro.koskinen@nsn.com>
Subject: [PATCH] drivers: net: ethernet: octeon_mgmt: fix a compiler warning
Date: Mon, 8 Sep 2014 18:01:53 +0300 [thread overview]
Message-ID: <1410188513-2541-1-git-send-email-aaro.koskinen@nsn.com> (raw)
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>
---
drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index 979c698..a422930 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 */
--
2.1.0
next reply other threads:[~2014-09-08 15:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 15:01 Aaro Koskinen [this message]
2014-09-08 16:36 ` [PATCH] drivers: net: ethernet: octeon_mgmt: fix a compiler warning David Daney
2014-09-08 21:24 ` David Miller
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=1410188513-2541-1-git-send-email-aaro.koskinen@nsn.com \
--to=aaro.koskinen@nsn.com \
--cc=david.daney@cavium.com \
--cc=netdev@vger.kernel.org \
/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.