From: David Decotigny <decot@google.com>
To: "David S. Miller" <davem@davemloft.net>,
Ben Hutchings <bhutchings@solarflare.com>,
mirq-linux@rere.qmqm.pl, Stanislaw Gruszka <sgruszka@redhat.com>,
Alexander Duyck <alexander.h.duyck@intel.com>,
Eilon Greenstein <eilong@broadcom.com>,
Grant Grundler <grundler@parisc-linux.org>,
e1000-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Cc: David Decotigny <decot@google.com>
Subject: [PATCHv4 1/7] ethtool: cosmetics: enforce const-ness in ethtool_cmd_speed
Date: Wed, 27 Apr 2011 21:32:37 -0700 [thread overview]
Message-ID: <1303965163-8198-2-git-send-email-decot@google.com> (raw)
In-Reply-To: <1303965163-8198-1-git-send-email-decot@google.com>
The 'ep' argument of ethtool_cmd_speed is not altered: advertise it in
protoype. +Indentation fix. Also add comments to advise using the
ethtool_cmd_speed API to get/set the link speed.
Signed-off-by: David Decotigny <decot@google.com>
---
include/linux/ethtool.h | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 9de3127..7e6e0a8 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -24,7 +24,10 @@ struct ethtool_cmd {
__u32 cmd;
__u32 supported; /* Features this interface supports */
__u32 advertising; /* Features this interface advertises */
- __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
+ __u16 speed; /* The forced speed (lower bits) in
+ * Mbps. Please use
+ * ethtool_cmd_speed()/_set() to
+ * access it */
__u8 duplex; /* Duplex, half or full */
__u8 port; /* Which connector port */
__u8 phy_address;
@@ -33,7 +36,10 @@ struct ethtool_cmd {
__u8 mdio_support;
__u32 maxtxpkt; /* Tx pkts before generating tx int */
__u32 maxrxpkt; /* Rx pkts before generating rx int */
- __u16 speed_hi;
+ __u16 speed_hi; /* The forced speed (upper
+ * bits) in Mbps. Please use
+ * ethtool_cmd_speed()/_set() to
+ * access it */
__u8 eth_tp_mdix;
__u8 reserved2;
__u32 lp_advertising; /* Features the link partner advertises */
@@ -41,14 +47,14 @@ struct ethtool_cmd {
};
static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
- __u32 speed)
+ __u32 speed)
{
ep->speed = (__u16)speed;
ep->speed_hi = (__u16)(speed >> 16);
}
-static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep)
+static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
{
return (ep->speed_hi << 16) | ep->speed;
}
--
1.7.3.1
next prev parent reply other threads:[~2011-04-28 4:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 4:32 [PATCHv4 0/7] ethtool: generalize use of ethtool_cmd_speed API David Decotigny
2011-04-28 4:32 ` David Decotigny [this message]
2011-04-28 4:32 ` [PATCHv4 2/7] ethtool: Call ethtool's get/set_settings callbacks with cleaned data David Decotigny
2011-04-28 7:34 ` Stanislaw Gruszka
2011-04-28 12:46 ` Ben Hutchings
2011-04-28 15:16 ` David Decotigny
2011-04-28 4:32 ` [PATCHv4 3/7] ethtool: Use full 32 bit speed range in ethtool's set_settings David Decotigny
2011-04-28 4:32 ` [PATCHv4 4/7] ethtool: cosmetic: Use ethtool ethtool_cmd_speed API David Decotigny
2011-04-28 4:32 ` [PATCHv4 5/7] acenic: Fix using the specified speed when configuring NIC David Decotigny
2011-04-28 4:32 ` [PATCHv4 6/7] tulip/de2104x: don't report different speeds depending on port type David Decotigny
2011-04-28 4:32 ` [PATCHv4 7/7] net/igb/e1000/e1000e: more robust ethtool duplex/speed configuration David Decotigny
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=1303965163-8198-2-git-send-email-decot@google.com \
--to=decot@google.com \
--cc=alexander.h.duyck@intel.com \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=e1000-devel@lists.sourceforge.net \
--cc=eilong@broadcom.com \
--cc=grundler@parisc-linux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=netdev@vger.kernel.org \
--cc=sgruszka@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox