From 992b2a9bb2512cee584fb16c0609677b80a99fdd Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Tue, 5 Apr 2011 04:26:27 +0000 Subject: [PATCH] --- yaml --- r: 247068 b: refs/heads/master c: 97322b3303a1de979b973dc1d0a43091f27258ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igbvf/ethtool.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1a55754fc3d8..c65f51d9f376 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6b1bfd17d42f9dc1d799b7e0eed817ed75005ec +refs/heads/master: 97322b3303a1de979b973dc1d0a43091f27258ac diff --git a/trunk/drivers/net/igbvf/ethtool.c b/trunk/drivers/net/igbvf/ethtool.c index 112ae15b2d49..b0b14d63dfbf 100644 --- a/trunk/drivers/net/igbvf/ethtool.c +++ b/trunk/drivers/net/igbvf/ethtool.c @@ -391,11 +391,6 @@ static int igbvf_set_wol(struct net_device *netdev, return -EOPNOTSUPP; } -static int igbvf_phys_id(struct net_device *netdev, u32 data) -{ - return 0; -} - static int igbvf_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec) { @@ -527,7 +522,6 @@ static const struct ethtool_ops igbvf_ethtool_ops = { .self_test = igbvf_diag_test, .get_sset_count = igbvf_get_sset_count, .get_strings = igbvf_get_strings, - .phys_id = igbvf_phys_id, .get_ethtool_stats = igbvf_get_ethtool_stats, .get_coalesce = igbvf_get_coalesce, .set_coalesce = igbvf_set_coalesce,