| Message ID | 1376672417-2798-1-git-send-email-kda@linux-powerpc.org |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello.
On 08/16/2013 09:00 PM, Denis Kirjanov wrote:
I'd rather name the patch "sundance: add netpoll support". "net-next:"
shouldn't be there twice definitely.
> 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
[...]
> @@ -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,
Could you align = here with the reset of initializers?
> +#endif
WBR, Sergei
--
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
On 8/17/13, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > Hello. > > On 08/16/2013 09:00 PM, Denis Kirjanov wrote: > > I'd rather name the patch "sundance: add netpoll support". "net-next:" > shouldn't be there twice definitely. Right, it was late at night so somehow I added prefix twice. > >> 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 > [...] >> @@ -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, > > Could you align = here with the reset of initializers? I'll respin. Thanks! >> +#endif > > WBR, Sergei > > -- > 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,
Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> --- drivers/net/ethernet/dlink/sundance.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)