From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: stephen hemminger <shemminger@vyatta.com>,
netdev@vger.kernel.org, gospo@redhat.com, bphilips@novell.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next-2.6 4/9] igbvf: remove bogus phys_id
Date: Wed, 4 May 2011 12:30:36 -0700 [thread overview]
Message-ID: <1304537441-2056-5-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1304537441-2056-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: stephen hemminger <shemminger@vyatta.com>
This device lies about supporting phys_id. Remove it and just
let the upper layer report not supported.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/igbvf/ethtool.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index 112ae15..b0b14d6 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/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,
--
1.7.4.4
next prev parent reply other threads:[~2011-05-04 19:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 19:30 [net-next-2.6 0/9][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 1/9] e100: fix build warning Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 2/9] ixgb: convert to set_phys_id Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 3/9] igb: Add check for invalid size to igb_get_invariants_82575() Jeff Kirsher
2011-05-04 19:30 ` Jeff Kirsher [this message]
2011-05-04 19:30 ` [net-next-2.6 5/9] ixgbe: Use function pointer for ixgbe_acquire/release_swfw_sync() Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 6/9] ixgbe: fix typo error with software defined pins on 82599 Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 7/9] ixgbe: fix sparse warning Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 8/9] ixgbe: improve EEPROM read/write operations Jeff Kirsher
2011-05-04 19:30 ` [net-next-2.6 9/9] ixgbe: Cleanup PCIe bus speed info Jeff Kirsher
2011-05-04 20:56 ` [net-next-2.6 0/9][pull request] Intel Wired LAN Driver Update David Miller
2011-05-04 20:59 ` David Miller
2011-05-04 21:14 ` Jeff Kirsher
2011-05-04 21:16 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304537441-2056-5-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=bphilips@novell.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).