Use new return type of ptp_get_msgtype(). Remove usage of magic number. Signed-off-by: Christian Eggers <cegg...@arri.de> Cc: Richard Cochran <richard.coch...@omicron.at> Cc: Kurt Kanzenbach <k...@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