From: Christian Eggers <ceggers@arri.de>
To: Richard Cochran <richardcochran@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>
Cc: Vladimir Oltean <olteanv@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S . Miller" <davem@davemloft.net>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Christian Eggers <ceggers@arri.de>,
"Richard Cochran" <richard.cochran@omicron.at>,
Kurt Kanzenbach <kurt@linutronix.de>
Subject: [PATCH net-next 2/4] net: phy: dp83640: use enum ptp_msg_type
Date: Tue, 17 Nov 2020 20:31:22 +0100 [thread overview]
Message-ID: <20201117193124.9789-2-ceggers@arri.de> (raw)
In-Reply-To: <20201117193124.9789-1-ceggers@arri.de>
Use new return type of ptp_get_msgtype(). Remove usage of magic number.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Cc: Richard Cochran <richard.cochran@omicron.at>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
---
drivers/net/phy/dp83640.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index f2caccaf4408..bb68db3518bc 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -88,7 +88,7 @@ struct rxts {
unsigned long tmo;
u64 ns;
u16 seqid;
- u8 msgtype;
+ enum ptp_msg_type msgtype;
u16 hash;
};
@@ -803,7 +803,7 @@ static int decode_evnt(struct dp83640_private *dp83640,
static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts)
{
struct ptp_header *hdr;
- u8 msgtype;
+ enum ptp_msg_type msgtype;
u16 seqid;
u16 hash;
@@ -815,7 +815,7 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts)
msgtype = ptp_get_msgtype(hdr, type);
- if (rxts->msgtype != (msgtype & 0xf))
+ if (rxts->msgtype != msgtype)
return 0;
seqid = be16_to_cpu(hdr->sequence_id);
@@ -964,7 +964,7 @@ static void decode_status_frame(struct dp83640_private *dp83640,
static int is_sync(struct sk_buff *skb, int type)
{
struct ptp_header *hdr;
- u8 msgtype;
+ enum ptp_msg_type msgtype;
hdr = ptp_parse_header(skb, type);
if (!hdr)
@@ -972,7 +972,7 @@ static int is_sync(struct sk_buff *skb, int type)
msgtype = ptp_get_msgtype(hdr, type);
- return (msgtype & 0xf) == 0;
+ return msgtype == PTP_MSGTYPE_SYNC;
}
static void dp83640_free_clocks(void)
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
next prev parent reply other threads:[~2020-11-17 19:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 19:31 [PATCH net-next 1/4] net: ptp: introduce enum ptp_msg_type Christian Eggers
2020-11-17 19:31 ` Christian Eggers [this message]
2020-11-17 19:31 ` [PATCH net-next 3/4] dpaa2-eth: use " Christian Eggers
2020-11-17 19:31 ` [PATCH net-next 4/4] ptp: ptp_ines: " Christian Eggers
2020-11-17 23:17 ` kernel test robot
2020-11-17 23:24 ` Vladimir Oltean
2020-11-18 13:18 ` [PATCH net-next 1/4] net: ptp: introduce " Richard Cochran
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=20201117193124.9789-2-ceggers@arri.de \
--to=ceggers@arri.de \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=richard.cochran@omicron.at \
--cc=richardcochran@gmail.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