From a7d7b9040e37afaba4144a513cb2065f24e4bc4c Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 3 Apr 2012 22:59:39 +0000 Subject: [PATCH] --- yaml --- r: 300489 b: refs/heads/master c: 3f84749004925dd1e94025292fed5c76ce418516 h: refs/heads/master i: 300487: 6fc79909a8b3d95d344df4f3609df01c310cab3b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 61e1f3ecfb38..4f97f2f6520f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 912b3b3d737cc8dc89a68568caf2355fb45d48ab +refs/heads/master: 3f84749004925dd1e94025292fed5c76ce418516 diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 7b71387cf93c..86097981e1e1 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -12233,6 +12233,7 @@ static const struct ethtool_ops tg3_ethtool_ops = { .get_rxfh_indir_size = tg3_get_rxfh_indir_size, .get_rxfh_indir = tg3_get_rxfh_indir, .set_rxfh_indir = tg3_set_rxfh_indir, + .get_ts_info = ethtool_op_get_ts_info, }; static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev,