Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300470
b: refs/heads/master
c: a85bbdd
h: refs/heads/master
v: v3
  • Loading branch information
Richard Cochran authored and David S. Miller committed Apr 4, 2012
1 parent d6f5ff1 commit 063255b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6663628729cc434b25eed2b917ef8e888cc46475
refs/heads/master: a85bbddd080ab49e461870411f6bb93f3d94ec11
20 changes: 20 additions & 0 deletions trunk/drivers/net/ethernet/adi/bfin_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,13 +548,33 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev,
return 0;
}

static int bfin_mac_ethtool_get_ts_info(struct net_device *dev,
struct ethtool_ts_info *info);
{
info->so_timestamping =
SOF_TIMESTAMPING_TX_HARDWARE |
SOF_TIMESTAMPING_RX_HARDWARE |
SOF_TIMESTAMPING_SYS_HARDWARE;
info->phc_index = -1;
info->tx_types =
(1 << HWTSTAMP_TX_OFF) |
(1 << HWTSTAMP_TX_ON);
info->rx_filters =
(1 << HWTSTAMP_FILTER_NONE) |
(1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
return 0;
}

static const struct ethtool_ops bfin_mac_ethtool_ops = {
.get_settings = bfin_mac_ethtool_getsettings,
.set_settings = bfin_mac_ethtool_setsettings,
.get_link = ethtool_op_get_link,
.get_drvinfo = bfin_mac_ethtool_getdrvinfo,
.get_wol = bfin_mac_ethtool_getwol,
.set_wol = bfin_mac_ethtool_setwol,
.get_ts_info = bfin_mac_ethtool_get_ts_info,
};

/**************************************************************************/
Expand Down

0 comments on commit 063255b

Please sign in to comment.