ixgb: use PCI_VENDOR_ID_INTEL

[deliverable/linux.git] / drivers / net / ethernet / jme.c

diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 55cbf65512c3bafb4780f6166e6d05ba5f314603..c911d883c27e6fbd922eab405aa2457db25be782 100644 (file)
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -2743,6 +2743,17 @@ jme_set_features(struct net_device *netdev, netdev_features_t features)
        return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void jme_netpoll(struct net_device *dev)
+{
+       unsigned long flags;
+
+       local_irq_save(flags);
+       jme_intr(dev->irq, dev);
+       local_irq_restore(flags);
+}
+#endif
+
 static int
 jme_nway_reset(struct net_device *netdev)
 {
@@ -2944,6 +2955,9 @@ static const struct net_device_ops jme_netdev_ops = {
        .ndo_tx_timeout         = jme_tx_timeout,
        .ndo_fix_features       = jme_fix_features,
        .ndo_set_features       = jme_set_features,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = jme_netpoll,
+#endif
 };
 
 static int __devinit
@@ -2991,7 +3005,6 @@ jme_init_one(struct pci_dev *pdev,
         */
        netdev = alloc_etherdev(sizeof(*jme));
        if (!netdev) {
-               pr_err("Cannot allocate netdev structure\n");
                rc = -ENOMEM;
                goto err_out_release_regions;
        }