diff options
| author | David S. Miller <davem@davemloft.net> | 2021-12-14 12:28:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-14 12:28:25 +0000 |
| commit | d0c3e46484fb9bafcfb0648da919f91eea7e14cd (patch) | |
| tree | d0589dd9852ae75573cf70f53e0d920bdeb63eb2 /drivers/net/ethernet/microchip/lan743x_ptp.c | |
| parent | a3c62a042237d1adeb0290dcb768e17edd6dcd25 (diff) | |
| parent | 085d61000845188a9aa9a9524f13a0622a1380d7 (diff) | |
Merge branch 'hwtstamp_bonding'
Hangbin Liu says:
====================
net: add new hwtstamp flag HWTSTAMP_FLAG_BONDED_PHC_INDEX
This patchset add a new hwtstamp_config flag HWTSTAMP_FLAG_BONDED_PHC_INDEX.
When user want to get bond active interface's PHC, they need to add this flag
and aware the PHC index may changed.
v3: Use bitwise test to check the flags validation
v2: rename the flag to HWTSTAMP_FLAG_BONDED_PHC_INDEX
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microchip/lan743x_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/lan743x_ptp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c index 9380e396f648..8b7a8d879083 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.c +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c @@ -1305,12 +1305,6 @@ int lan743x_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) return -EFAULT; - if (config.flags) { - netif_warn(adapter, drv, adapter->netdev, - "ignoring hwtstamp_config.flags == 0x%08X, expected 0\n", - config.flags); - } - switch (config.tx_type) { case HWTSTAMP_TX_OFF: for (index = 0; index < LAN743X_MAX_TX_CHANNELS; |