From: Kurt Kanzenbach <kurt@linutronix.de>
To: Richard Cochran <richardcochran@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Jiri Pirko <jiri@mellanox.com>,
Ido Schimmel <idosch@mellanox.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>,
Samuel Zou <zou_wei@huawei.com>,
netdev@vger.kernel.org, Petr Machata <petrm@mellanox.com>,
Kurt Kanzenbach <kurt@linutronix.de>
Subject: [PATCH v3 6/9] ethernet: ti: cpts: Use generic helper function
Date: Thu, 30 Jul 2020 10:00:45 +0200 [thread overview]
Message-ID: <20200730080048.32553-7-kurt@linutronix.de> (raw)
In-Reply-To: <20200730080048.32553-1-kurt@linutronix.de>
In order to reduce code duplication between ptp drivers, generic helper
functions were introduced. Use them.
Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
---
drivers/net/ethernet/ti/cpts.c | 37 +++++++++-------------------------
1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 7c55d395de2c..2c5c05620e6e 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -446,41 +446,22 @@ static const struct ptp_clock_info cpts_info = {
static int cpts_skb_get_mtype_seqid(struct sk_buff *skb, u32 *mtype_seqid)
{
unsigned int ptp_class = ptp_classify_raw(skb);
- u8 *msgtype, *data = skb->data;
- unsigned int offset = 0;
- u16 *seqid;
+ struct ptp_header *hdr;
+ u8 msgtype;
+ u16 seqid;
if (ptp_class == PTP_CLASS_NONE)
return 0;
- if (ptp_class & PTP_CLASS_VLAN)
- offset += VLAN_HLEN;
-
- switch (ptp_class & PTP_CLASS_PMASK) {
- case PTP_CLASS_IPV4:
- offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
- break;
- case PTP_CLASS_IPV6:
- offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;
- break;
- case PTP_CLASS_L2:
- offset += ETH_HLEN;
- break;
- default:
- return 0;
- }
-
- if (skb->len + ETH_HLEN < offset + OFF_PTP_SEQUENCE_ID + sizeof(*seqid))
+ hdr = ptp_parse_header(skb, ptp_class);
+ if (!hdr)
return 0;
- if (unlikely(ptp_class & PTP_CLASS_V1))
- msgtype = data + offset + OFF_PTP_CONTROL;
- else
- msgtype = data + offset;
+ msgtype = ptp_get_msgtype(hdr, ptp_class);
+ seqid = be16_to_cpu(hdr->sequence_id);
- seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID);
- *mtype_seqid = (*msgtype & MESSAGE_TYPE_MASK) << MESSAGE_TYPE_SHIFT;
- *mtype_seqid |= (ntohs(*seqid) & SEQUENCE_ID_MASK) << SEQUENCE_ID_SHIFT;
+ *mtype_seqid = (msgtype & MESSAGE_TYPE_MASK) << MESSAGE_TYPE_SHIFT;
+ *mtype_seqid |= (seqid & SEQUENCE_ID_MASK) << SEQUENCE_ID_SHIFT;
return 1;
}
--
2.20.1
next prev parent reply other threads:[~2020-07-30 8:01 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 8:00 [PATCH v3 0/9] ptp: Add generic helper functions Kurt Kanzenbach
2020-07-30 8:00 ` [PATCH v3 1/9] ptp: Add generic ptp v2 header parsing function Kurt Kanzenbach
2020-07-30 10:15 ` Petr Machata
2020-07-31 10:06 ` Kurt Kanzenbach
2020-08-04 20:56 ` Grygorii Strashko
2020-08-04 21:07 ` Russell King - ARM Linux admin
2020-08-04 21:34 ` Grygorii Strashko
2020-08-04 21:44 ` Russell King - ARM Linux admin
2020-08-04 22:04 ` Grygorii Strashko
2020-08-04 23:14 ` Russell King - ARM Linux admin
2020-08-05 9:29 ` Kurt Kanzenbach
2020-08-05 12:59 ` Grygorii Strashko
2020-08-05 13:57 ` Kurt Kanzenbach
2020-08-05 19:15 ` Grygorii Strashko
2020-08-06 7:56 ` Kurt Kanzenbach
2020-08-05 15:25 ` Richard Cochran
2020-08-02 15:13 ` Richard Cochran
2020-08-02 20:20 ` Florian Fainelli
2020-07-30 8:00 ` [PATCH v3 2/9] ptp: Add generic ptp message type function Kurt Kanzenbach
2020-08-02 15:18 ` Richard Cochran
2020-08-02 20:20 ` Florian Fainelli
2020-07-30 8:00 ` [PATCH v3 3/9] net: dsa: mv88e6xxx: Use generic helper function Kurt Kanzenbach
2020-08-02 15:18 ` Richard Cochran
2020-08-02 20:21 ` Florian Fainelli
2020-07-30 8:00 ` [PATCH v3 4/9] mlxsw: spectrum_ptp: " Kurt Kanzenbach
2020-07-30 10:20 ` Petr Machata
2020-08-02 20:21 ` Florian Fainelli
2020-07-30 8:00 ` [PATCH v3 5/9] ethernet: ti: am65-cpts: " Kurt Kanzenbach
2020-07-30 9:19 ` Grygorii Strashko
2020-07-30 9:36 ` Kurt Kanzenbach
2020-07-30 10:24 ` Arnd Bergmann
2020-07-31 11:48 ` Kurt Kanzenbach
2020-07-31 12:55 ` Grygorii Strashko
2020-07-31 13:10 ` Kurt Kanzenbach
2020-07-30 8:00 ` Kurt Kanzenbach [this message]
2020-08-02 20:22 ` [PATCH v3 6/9] ethernet: ti: cpts: " Florian Fainelli
2020-08-05 18:52 ` Grygorii Strashko
2020-07-30 8:00 ` [PATCH v3 7/9] net: phy: dp83640: " Kurt Kanzenbach
2020-08-02 20:23 ` Florian Fainelli
2020-08-02 22:54 ` Richard Cochran
2020-07-30 8:00 ` [PATCH v3 8/9] ptp: ptp_ines: " Kurt Kanzenbach
2020-08-02 20:23 ` Florian Fainelli
2020-07-30 8:00 ` [PATCH v3 9/9] ptp: Remove unused macro Kurt Kanzenbach
2020-08-02 20:24 ` Florian Fainelli
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=20200730080048.32553-7-kurt@linutronix.de \
--to=kurt@linutronix.de \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=grygorii.strashko@ti.com \
--cc=hkallweit1@gmail.com \
--cc=idosch@mellanox.com \
--cc=ivan.khoronzhuk@linaro.org \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=petrm@mellanox.com \
--cc=richardcochran@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=zou_wei@huawei.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;
as well as URLs for NNTP newsgroup(s).