diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:09 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:58 +0300 |
| commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 (patch) | |
| tree | 4bbd64f6671391d6d93c1a1806ffec005114524e /drivers/net/ethernet/microchip/lan743x_ptp.c | |
| parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 (diff) | |
| parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 (diff) | |
| download | linux-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging to get the mac80211 updates that have since propagated
into net-next.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/ethernet/microchip/lan743x_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/lan743x_ptp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c index afe52463dc57..9399f6a98748 100644 --- a/drivers/net/ethernet/microchip/lan743x_ptp.c +++ b/drivers/net/ethernet/microchip/lan743x_ptp.c @@ -1265,6 +1265,9 @@ int lan743x_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) lan743x_ptp_set_sync_ts_insert(adapter, true); break; + case HWTSTAMP_TX_ONESTEP_P2P: + ret = -ERANGE; + break; default: netif_warn(adapter, drv, adapter->netdev, " tx_type = %d, UNKNOWN\n", config.tx_type); |