Commit cf536ea3 authored by Yangbo Lu's avatar Yangbo Lu Committed by David S. Miller
Browse files

net: dsa: no longer identify PTP packet in core driver 



Move ptp_classify_raw out of dsa core driver for handling tx
timestamp request. Let device drivers do this if they want.
Not all drivers want to limit tx timestamping for only PTP
packet.

Signed-off-by: default avatarYangbo Lu <yangbo.lu@nxp.com>
Tested-by: default avatarKurt Kanzenbach <kurt@linutronix.de>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfd12c06

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c

+6 −1
Original line number Diff line number Diff line
@@ -374,14 +374,19 @@ long hellcreek_hwtstamp_work(struct ptp_clock_info *ptp) 
}



bool hellcreek_port_txtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type)

			     struct sk_buff *clone)

{

	struct hellcreek *hellcreek = ds->priv;

	struct hellcreek_port_hwtstamp *ps;

	struct ptp_header *hdr;

	unsigned int type;



	ps = &hellcreek->ports[port].port_hwtstamp;



	type = ptp_classify_raw(clone);

	if (type == PTP_CLASS_NONE)

		return false;



	/* Make sure the message is a PTP message that needs to be timestamped

	 * and the interaction with the HW timestamping is enabled. If not, stop

	 * here

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int hellcreek_port_hwtstamp_get(struct dsa_switch *ds, int port, 
bool hellcreek_port_rxtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type);

bool hellcreek_port_txtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type);

			     struct sk_buff *clone);



int hellcreek_get_ts_info(struct dsa_switch *ds, int port,

			  struct ethtool_ts_info *info);

drivers/net/dsa/mv88e6xxx/hwtstamp.c

+6 −1
Original line number Diff line number Diff line
@@ -469,11 +469,16 @@ long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp) 
}



bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type)

			     struct sk_buff *clone)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	struct mv88e6xxx_port_hwtstamp *ps = &chip->port_hwtstamp[port];

	struct ptp_header *hdr;

	unsigned int type;



	type = ptp_classify_raw(clone);

	if (type == PTP_CLASS_NONE)

		return false;



	hdr = mv88e6xxx_should_tstamp(chip, port, clone, type);

	if (!hdr)

drivers/net/dsa/mv88e6xxx/hwtstamp.h

+2 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds, int port, 
bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type);

bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,

			     struct sk_buff *clone, unsigned int type);

			     struct sk_buff *clone);



int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,

			  struct ethtool_ts_info *info);
@@ -152,8 +152,7 @@ static inline bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port, 
}



static inline bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,

					   struct sk_buff *clone,

					   unsigned int type)

					   struct sk_buff *clone)

{

	return false;

}

drivers/net/dsa/ocelot/felix.c

+1 −1
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ static bool felix_rxtstamp(struct dsa_switch *ds, int port, 
}



static bool felix_txtstamp(struct dsa_switch *ds, int port,

			   struct sk_buff *clone, unsigned int type)

			   struct sk_buff *clone)

{

	struct ocelot *ocelot = ds->priv;

	struct ocelot_port *ocelot_port = ocelot->ports[port];