1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 0a3a379b634c..e3f1a0707267 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -1125,6 +1125,26 @@ static void sbdma_fillring(sbmacdma_t *d)
         }
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void sbmac_netpoll(struct net_device *netdev)
+{
+        struct sbmac_softc *sc = netdev_priv(netdev);
+        int irq = sc->sbm_dev->irq;
+
+        __raw_writeq(0, sc->sbm_imr);
+
+        sbmac_intr(irq, netdev, NULL);
+
+#ifdef CONFIG_SBMAC_COALESCE
+        __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
+        ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0),
+        sc->sbm_imr);
+#else
+        __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | 
+        (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr);
+#endif
+}
+#endif
 
 /**********************************************************************
  *  SBDMA_RX_PROCESS(sc,d)
@@ -2399,6 +2419,9 @@ static int sbmac_init(struct net_device *dev, int idx)
         dev->watchdog_timeo     = TX_TIMEOUT;
 
         dev->change_mtu         = sb1250_change_mtu;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = sbmac_netpoll;
+#endif
 
         /* This is needed for PASS2 for Rx H/W checksum feature */
         sbmac_set_iphdr_offset(sc);