Merge branch 'net-ptp-introduce-common-defines-for-ptp-message-types' (2fc9e684) · Commits · 戴 / test

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -686,7 +686,7 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv,
		if (skb->cb[0] == TX_TSTAMP_ONESTEP_SYNC) {
		if (dpaa2_eth_ptp_parse(skb, &msgtype, &twostep, &udp,
		&offset1, &offset2) \|\|
		msgtype != 0 \|\| twostep) {
		msgtype != PTP_MSGTYPE_SYNC \|\| twostep) {
		WARN_ONCE(1, "Bad packet for one-step timestamping\n");
		return;
		}
		@@ -1212,7 +1212,7 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff skb, struct net_device net_dev)
		if (skb->cb[0] == TX_TSTAMP_ONESTEP_SYNC) {
		if (!dpaa2_eth_ptp_parse(skb, &msgtype, &twostep, &udp,
		&offset1, &offset2))
		if (msgtype == 0 && twostep == 0) {
		if (msgtype == PTP_MSGTYPE_SYNC && twostep == 0) {
		skb_queue_tail(&priv->tx_skbs, skb);
		queue_work(priv->dpaa2_ptp_wq,
		&priv->tx_onestep_tstamp);

+7 −12

Original line number	Diff line number	Diff line
		@@ -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);

		@@ -683,9 +678,9 @@ static bool is_sync_pdelay_resp(struct sk_buff *skb, int type)

		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;
		@@ -696,13 +691,13 @@ static u8 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;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,11 @@
		#define PTP_CLASS_V2_VLAN (PTP_CLASS_V2 \| PTP_CLASS_VLAN)
		#define PTP_CLASS_L4 (PTP_CLASS_IPV4 \| PTP_CLASS_IPV6)

		#define PTP_MSGTYPE_SYNC 0x0
		#define PTP_MSGTYPE_DELAY_REQ 0x1
		#define PTP_MSGTYPE_PDELAY_REQ 0x2
		#define PTP_MSGTYPE_PDELAY_RESP 0x3

		#define PTP_EV_PORT 319
		#define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */

		@@ -140,7 +145,7 @@ static inline u8 ptp_get_msgtype(const struct ptp_header *hdr,
		/* The return is meaningless. The stub function would not be
		* executed since no available header from ptp_parse_header.
		*/
		return 0;
		return PTP_MSGTYPE_SYNC;
		}
		#endif
		#endif /* _PTP_CLASSIFY_H_ */