---

yaml --- r: 300489 b: refs/heads/master c: 3f84749 h: refs/heads/master i: 300487: 6fc7990 v: v3
git-mirror · Apr 4, 2012 · a7d7b90 · a7d7b90
1 parent 24fedec
commit a7d7b90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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,