e1000: warn if this driver is used for e1000e devices
authorAuke Kok <auke-jan.h.kok@intel.com>
Mon, 11 Feb 2008 17:25:46 +0000 (09:25 -0800)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 19:51:40 +0000 (14:51 -0500)
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 <auke-jan.h.kok@intel.com>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/e1000/e1000_main.c

index d4ee8ec34b564f7604876da854f539d00bf53c3c..0991648c53dc2f5bc0c1d5aee568c3a0a007d6e5 100644 (file)
@@ -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 */
        e1000_reset(adapter);