Skip to content
Permalink
Browse files
ptp: ptp_ines: use enum ptp_msg_type
Use new return type of ptp_get_msgtype(). Remove driver internal defines
for this.

Signed-off-by: Christian Eggers <ceggers@arri.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
  • Loading branch information
ceggers-arri authored and intel-lab-lkp committed Nov 17, 2020
1 parent 09d415c commit c4e4cfcabe3201e2ece90cc9025894e4ed08f069
Showing 1 changed file with 10 additions and 15 deletions.
@@ -108,11 +108,6 @@ MODULE_LICENSE("GPL");
#define MESSAGE_TYPE_P_DELAY_RESP 3
#define MESSAGE_TYPE_DELAY_REQ 4

#define SYNC 0x0
#define DELAY_REQ 0x1
#define PDELAY_REQ 0x2
#define PDELAY_RESP 0x3

static LIST_HEAD(ines_clocks);
static DEFINE_MUTEX(ines_clocks_lock);

@@ -442,7 +437,7 @@ static bool ines_match(struct sk_buff *skb, unsigned int ptp_class,
{
struct ptp_header *hdr;
u16 portn, seqid;
u8 msgtype;
enum ptp_msg_type msgtype;
u64 clkid;

if (unlikely(ptp_class & PTP_CLASS_V1))
@@ -675,34 +670,34 @@ static void ines_txtstamp_work(struct work_struct *work)
static bool is_sync_pdelay_resp(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)
return false;

msgtype = ptp_get_msgtype(hdr, type);

switch ((msgtype & 0xf)) {
case SYNC:
case PDELAY_RESP:
switch (msgtype) {
case PTP_MSGTYPE_SYNC:
case PTP_MSGTYPE_PDELAY_RESP:
return true;
default:
return false;
}
}

static u8 tag_to_msgtype(u8 tag)
static enum ptp_msg_type tag_to_msgtype(u8 tag)
{
switch (tag) {
case MESSAGE_TYPE_SYNC:
return SYNC;
return PTP_MSGTYPE_SYNC;
case MESSAGE_TYPE_P_DELAY_REQ:
return PDELAY_REQ;
return PTP_MSGTYPE_PDELAY_REQ;
case MESSAGE_TYPE_P_DELAY_RESP:
return PDELAY_RESP;
return PTP_MSGTYPE_PDELAY_RESP;
case MESSAGE_TYPE_DELAY_REQ:
return DELAY_REQ;
return PTP_MSGTYPE_DELAY_REQ;
}
return 0xf;
}

0 comments on commit c4e4cfc

Please sign in to comment.