summaryrefslogtreecommitdiff
path: root/drivers/net/phy/micrel.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2022-03-07 11:31:34 +0000
committerDavid S. Miller <davem@davemloft.net>2022-03-07 11:31:34 +0000
commitcd0b6277c3aafdf855a7cded10defd7705e6580e (patch)
tree78c6c8f0eee3afb62c390ac91c80267e80b2fb41 /drivers/net/phy/micrel.c
parent669b258a793db9f1c3bff29ce2bbd61b810503ad (diff)
parent3914a9c07e8c3a30f178f1c92e2354b9cffdecb5 (diff)
downloadlinux-cd0b6277c3aafdf855a7cded10defd7705e6580e.tar.gz
linux-cd0b6277c3aafdf855a7cded10defd7705e6580e.tar.bz2
linux-cd0b6277c3aafdf855a7cded10defd7705e6580e.zip
Merge branch 'ptp-is_sync'
Kurt Kanzenbach says: ==================== ptp: Add generic is_sync() function as multiple PHY drivers such as micrel or TI dp83640 need to inspect whether a given skb represents a PTP Sync message, provide a generic function for it. This avoids code duplication and can be reused by future PHY IEEE 1588 implementations. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/micrel.c')
-rw-r--r--drivers/net/phy/micrel.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 81a76322254c..9e6b29b23935 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -1976,17 +1976,6 @@ static int lan8814_hwtstamp(struct mii_timestamper *mii_ts, struct ifreq *ifr)
return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0;
}
-static bool is_sync(struct sk_buff *skb, int type)
-{
- struct ptp_header *hdr;
-
- hdr = ptp_parse_header(skb, type);
- if (!hdr)
- return false;
-
- return ((ptp_get_msgtype(hdr, type) & 0xf) == 0);
-}
-
static void lan8814_txtstamp(struct mii_timestamper *mii_ts,
struct sk_buff *skb, int type)
{
@@ -1994,7 +1983,7 @@ static void lan8814_txtstamp(struct mii_timestamper *mii_ts,
switch (ptp_priv->hwts_tx_type) {
case HWTSTAMP_TX_ONESTEP_SYNC:
- if (is_sync(skb, type)) {
+ if (ptp_msg_is_sync(skb, type)) {
kfree_skb(skb);
return;
}