Commit:     14782ca8262818921a460c80a761a93740b838a2
Parent:     030ed68bf063e99cea6371d1fb771a870cab1c1d
Author:     Auke Kok <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 11 09:25:46 2008 -0800
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Mon Feb 11 14:51:40 2008 -0500

    e1000: warn if this driver is used for e1000e devices
    We're already starting to see reports from users still
    using e1000 where they should be using e1000e now that this is
    actually possible. Just to prevent some of this thrash, add
    a big warning on load on these devices that people should
    switch to e1000e.
    Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
    Acked-by: Jesse Brandeburg <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/e1000/e1000_main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index d4ee8ec..0991648 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1195,6 +1195,14 @@ e1000_probe(struct pci_dev *pdev,
        printk("%s\n", print_mac(mac, netdev->dev_addr));
+       if (adapter->hw.bus_type == e1000_bus_type_pci_express) {
+               DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
+                       "longer be supported by this driver in the future.\n",
+                       pdev->vendor, pdev->device);
+               DPRINTK(PROBE, WARNING, "please use the \"e1000e\" "
+                       "driver instead.\n");
+       }
        /* reset the hardware with the new settings */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to