On Thu, Jul 30, 2020 at 10:00:46AM +0200, Kurt Kanzenbach wrote:
> In order to reduce code duplication between ptp drivers, generic helper
> functions were introduced. Use them.
>
> Signed-off-by: Kurt Kanzenbach <k...@linutronix.de>
> ---
> drivers/net/phy/dp83640.c | 69 +++++++++------------------------------
> 1 file changed, 16 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
> index 50fb7d16b75a..1cd987e3d0f2 100644
> --- a/drivers/net/phy/dp83640.c
> +++ b/drivers/net/phy/dp83640.c
> @@ -803,46 +803,28 @@ static int decode_evnt(struct dp83640_private *dp83640,
>
> static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts)
> {
> - unsigned int offset = 0;
> - u8 *msgtype, *data = skb_mac_header(skb);
> - __be16 *seqid;
> + struct ptp_header *hdr;
> + u8 msgtype;
> + u16 seqid;
> u16 hash;
>
> /* check sequenceID, messageType, 12 bit hash of offset 20-29 */
>
> - if (type & PTP_CLASS_VLAN)
> - offset += VLAN_HLEN;
> -
> - switch (type & 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:
> + hdr = ptp_parse_header(skb, type);
> + if (!hdr)
> return 0;
> - }
>
> - if (skb->len + ETH_HLEN < offset + OFF_PTP_SEQUENCE_ID + sizeof(*seqid))
> - return 0;
> + msgtype = ptp_get_msgtype(hdr, type);
>
> - if (unlikely(type & PTP_CLASS_V1))
> - msgtype = data + offset + OFF_PTP_CONTROL;
> - else
> - msgtype = data + offset;
> - if (rxts->msgtype != (*msgtype & 0xf))
> + if (rxts->msgtype != (msgtype & 0xf))
> return 0;
>
> - seqid = (__be16 *)(data + offset + OFF_PTP_SEQUENCE_ID);
> - if (rxts->seqid != ntohs(*seqid))
> + seqid = be16_to_cpu(hdr->sequence_id);
> + if (rxts->seqid != seqid)
> return 0;
>
> hash = ether_crc(DP83640_PACKET_HASH_LEN,
> - data + offset + DP83640_PACKET_HASH_OFFSET) >> 20;
> + (unsigned char *)&hdr->source_port_identity) >> 20;
Looks like DP83640_PACKET_HASH_OFFSET can be removed now.
Tested-by: Richard Cochran <richardcoch...@gmail.com>
