Commit 9c9211a3 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

net_tstamp: add new flag HWTSTAMP_FLAG_BONDED_PHC_INDEX 



Since commit 94dd016a ("bond: pass get_ts_info and SIOC[SG]HWTSTAMP
ioctl to active device") the user could get bond active interface's
PHC index directly. But when there is a failover, the bond active
interface will change, thus the PHC index is also changed. This may
break the user's program if they did not update the PHC timely.

This patch adds a new hwtstamp_config flag HWTSTAMP_FLAG_BONDED_PHC_INDEX.
When the user wants to get the bond active interface's PHC, they need to
add this flag and be aware the PHC index may be changed.

With the new flag. All flag checks in current drivers are removed. Only
the checking in net_hwtstamp_validate() is kept.

Suggested-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3c62a04

drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ static int hellcreek_set_hwtstamp_config(struct hellcreek *hellcreek, int port, 
	 */

	clear_bit_unlock(HELLCREEK_HWTSTAMP_ENABLED, &ps->state);



	/* Reserved for future extensions */

	if (config->flags)

		return -EINVAL;



	switch (config->tx_type) {

	case HWTSTAMP_TX_ON:

		tx_tstamp_enable = true;

drivers/net/dsa/mv88e6xxx/hwtstamp.c

+0 −4
Original line number Diff line number Diff line
@@ -100,10 +100,6 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port, 
	 */

	clear_bit_unlock(MV88E6XXX_HWTSTAMP_ENABLED, &ps->state);



	/* reserved for future extensions */

	if (config->flags)

		return -EINVAL;



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

		tstamp_enable = false;

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

+0 −3
Original line number Diff line number Diff line
@@ -1508,9 +1508,6 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata, 
	if (copy_from_user(&config, ifreq->ifr_data, sizeof(config)))

		return -EFAULT;



	if (config.flags)

		return -EINVAL;



	mac_tscr = 0;



	switch (config.tx_type) {

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+0 −3
Original line number Diff line number Diff line
@@ -231,9 +231,6 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev) 
static int aq_ndev_config_hwtstamp(struct aq_nic_s *aq_nic,

				   struct hwtstamp_config *config)

{

	if (config->flags)

		return -EINVAL;



	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:

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

+0 −5
Original line number Diff line number Diff line
@@ -15356,11 +15356,6 @@ static int bnx2x_hwtstamp_ioctl(struct bnx2x *bp, struct ifreq *ifr) 
	DP(BNX2X_MSG_PTP, "Requested tx_type: %d, requested rx_filters = %d\n",

	   config.tx_type, config.rx_filter);



	if (config.flags) {

		BNX2X_ERR("config.flags is reserved for future use\n");

		return -EINVAL;

	}



	bp->hwtstamp_ioctl_called = true;

	bp->tx_type = config.tx_type;

	bp->rx_filter = config.rx_filter;