| Message ID | 1376670748-2084-1-git-send-email-kda@linux-powerpc.org |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
David, please ignore these patches since they are obviously intended for net-next. Thanks! On 8/16/13, Denis Kirjanov <kda@linux-powerpc.org> wrote: > add netconsole logging support > > Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> > --- > drivers/net/ethernet/dlink/sundance.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/net/ethernet/dlink/sundance.c > b/drivers/net/ethernet/dlink/sundance.c > index 50d9c63..2688a84 100644 > --- a/drivers/net/ethernet/dlink/sundance.c > +++ b/drivers/net/ethernet/dlink/sundance.c > @@ -469,6 +469,17 @@ static void sundance_reset(struct net_device *dev, > unsigned long reset_cmd) > } > } > > +#ifdef CONFIG_NET_POLL_CONTROLLER > +static void sundance_poll_controller(struct net_device *dev) > +{ > + struct netdev_private *np = netdev_priv(dev); > + > + disable_irq(np->pci_dev->irq); > + intr_handler(np->pci_dev->irq, dev); > + enable_irq(np->pci_dev->irq); > +} > +#endif > + > static const struct net_device_ops netdev_ops = { > .ndo_open = netdev_open, > .ndo_stop = netdev_close, > @@ -480,6 +491,9 @@ static const struct net_device_ops netdev_ops = { > .ndo_change_mtu = change_mtu, > .ndo_set_mac_address = sundance_set_mac_addr, > .ndo_validate_addr = eth_validate_addr, > +#ifdef CONFIG_NET_POLL_CONTROLLER > + .ndo_poll_controller = sundance_poll_controller, > +#endif > }; > > static int sundance_probe1(struct pci_dev *pdev, > -- > 1.8.0.2 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 50d9c63..2688a84 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c @@ -469,6 +469,17 @@ static void sundance_reset(struct net_device *dev, unsigned long reset_cmd) } } +#ifdef CONFIG_NET_POLL_CONTROLLER +static void sundance_poll_controller(struct net_device *dev) +{ + struct netdev_private *np = netdev_priv(dev); + + disable_irq(np->pci_dev->irq); + intr_handler(np->pci_dev->irq, dev); + enable_irq(np->pci_dev->irq); +} +#endif + static const struct net_device_ops netdev_ops = { .ndo_open = netdev_open, .ndo_stop = netdev_close, @@ -480,6 +491,9 @@ static const struct net_device_ops netdev_ops = { .ndo_change_mtu = change_mtu, .ndo_set_mac_address = sundance_set_mac_addr, .ndo_validate_addr = eth_validate_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = sundance_poll_controller, +#endif }; static int sundance_probe1(struct pci_dev *pdev,
add netconsole logging support Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> --- drivers/net/ethernet/dlink/sundance.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)