diff options
author | Peter Wu <lekensteyn@gmail.com> | 2012-07-17 02:29:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-18 12:40:54 -0400 |
commit | ed36d7b2578e4235d7c281304c14e4085f286236 (patch) | |
tree | 46cfc645ff57e32978c4f76b5bc9c169a1e0db7c /drivers/net/ethernet/jme.c | |
parent | 02756ed4a79f15e4f265c1f6fbc634ce9966f153 (diff) |
jme: netpoll support
This patch adds the netpoll function to support netconsole. Tested and works
fine on my "JMC250 PCI Express Gigabit Ethernet Controller" (PCI ID 0250).
Signed-off-by: Peter Wu <lekensteyn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/jme.c')
-rw-r--r-- | drivers/net/ethernet/jme.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 4ea6580d3ae8..c911d883c27e 100644 --- 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) | |||
2743 | return 0; | 2743 | return 0; |
2744 | } | 2744 | } |
2745 | 2745 | ||
2746 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
2747 | static void jme_netpoll(struct net_device *dev) | ||
2748 | { | ||
2749 | unsigned long flags; | ||
2750 | |||
2751 | local_irq_save(flags); | ||
2752 | jme_intr(dev->irq, dev); | ||
2753 | local_irq_restore(flags); | ||
2754 | } | ||
2755 | #endif | ||
2756 | |||
2746 | static int | 2757 | static int |
2747 | jme_nway_reset(struct net_device *netdev) | 2758 | jme_nway_reset(struct net_device *netdev) |
2748 | { | 2759 | { |
@@ -2944,6 +2955,9 @@ static const struct net_device_ops jme_netdev_ops = { | |||
2944 | .ndo_tx_timeout = jme_tx_timeout, | 2955 | .ndo_tx_timeout = jme_tx_timeout, |
2945 | .ndo_fix_features = jme_fix_features, | 2956 | .ndo_fix_features = jme_fix_features, |
2946 | .ndo_set_features = jme_set_features, | 2957 | .ndo_set_features = jme_set_features, |
2958 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
2959 | .ndo_poll_controller = jme_netpoll, | ||
2960 | #endif | ||
2947 | }; | 2961 | }; |
2948 | 2962 | ||
2949 | static int __devinit | 2963 | static int __devinit |