Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3412575 authored by Miroslav Lichvar's avatar Miroslav Lichvar Committed by David S. Miller
Browse files

net: ethernet: update drivers to handle HWTSTAMP_FILTER_NTP_ALL 



Include HWTSTAMP_FILTER_NTP_ALL in net_hwtstamp_validate() as a valid
filter and update drivers which can timestamp all packets, or which
explicitly list unsupported filters instead of using a default case, to
handle the filter.

CC: Richard Cochran <richardcochran@gmail.com>
CC: Willem de Bruijn <willemb@google.com>
Signed-off-by: default avatarMiroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8210a9e

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+1 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata, 
	case HWTSTAMP_FILTER_NONE:

		break;



	case HWTSTAMP_FILTER_NTP_ALL:

	case HWTSTAMP_FILTER_ALL:

		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 1);

		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −0
Original line number Diff line number Diff line
@@ -15351,6 +15351,7 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp) 
		break;

	case HWTSTAMP_FILTER_ALL:

	case HWTSTAMP_FILTER_SOME:

	case HWTSTAMP_FILTER_NTP_ALL:

		bp->rx_filter = HWTSTAMP_FILTER_NONE;

		break;

	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −0
Original line number Diff line number Diff line
@@ -3024,6 +3024,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr) 
	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		conf.rx_filter = HWTSTAMP_FILTER_ALL;

		break;

	default:

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2085,6 +2085,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr) 
	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		conf.rx_filter = HWTSTAMP_FILTER_ALL;

		break;

	default:

drivers/net/ethernet/cavium/octeon/octeon_mgmt.c

+1 −0
Original line number Diff line number Diff line
@@ -755,6 +755,7 @@ static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev, 
	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		p->has_rx_tstamp = have_hw_timestamps;

		config.rx_filter = HWTSTAMP_FILTER_ALL;

		if (p->has_rx_tstamp) {