[PATCH] Revert mistakenly applied patch to sungem

From: Colin Leroy (colin_at_colino.net)
Date: 09/30/04

  • Next message: David Gibson: "Re: [PPC64] Improved VSID allocation algorithm" 
    Date:	Thu, 30 Sep 2004 10:01:56 +0200
To: linux-kernel@vger.kernel.org

    Hi Andrew, everyone,

    There's a mistake in 2.6.9-rc3, you applied a patch I sent yesterday,
    for something that was already implemented (netpoll support in sungem).

    As Eric Lemoine and I didn't add the stuff at the same place, there has
    been no conflict.

    See http://marc.theaimsgroup.com/?l=linux-kernel&m=109647405508937&w=2
    http://linux.bkbits.net:8080/linux-2.5/cset@4149f001_LtxxbZOVP8q363TiTcSVg
    http://linux.bkbits.net:8080/linux-2.5/cset@415b4276tcoFzDd1YSqq2ZJ_OkYlfQ

    Following is the reverse patch to reverse my stuff :)
    Sorry about that.

    Signed-off-by: Colin Leroy <colin@colino.net>

    --- a/drivers/net/sungem.c 2004-09-29 12:15:56.000000000 +0200
    +++ b/drivers/net/sungem.c 2004-09-29 12:22:41.000000000 +0200
    @@ -2687,23 +2687,6 @@
     }
     #endif /* not Sparc and not PPC */
     
    -#ifdef CONFIG_NET_POLL_CONTROLLER
    -/*
    - * Polling 'interrupt' - used by things like netconsole to send skbs
    - * without having to re-enable interrupts. It's not called while
    - * the interrupt routine is executing.
    - */
    -static void gem_netpoll(struct net_device *netdev)
    -{
    - struct gem *gp = netdev->priv;
    - if (!gp->pdev)
    - return;
    - disable_irq(gp->pdev->irq);
    - gem_interrupt(gp->pdev->irq, netdev, NULL);
    - enable_irq(gp->pdev->irq);
    -}
    -#endif
    -
     static int __devinit gem_get_device_address(struct gem *gp)
     {
     #if defined(__sparc__) || defined(CONFIG_PPC_PMAC)
    @@ -2899,9 +2882,6 @@
             dev->set_multicast_list = gem_set_multicast;
             dev->do_ioctl = gem_ioctl;
             dev->poll = gem_poll;
    -#ifdef CONFIG_NET_POLL_CONTROLLER
    - dev->poll_controller = gem_netpoll;
    -#endif
             dev->weight = 64;
             dev->ethtool_ops = &gem_ethtool_ops;
             dev->tx_timeout = gem_tx_timeout;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: David Gibson: "Re: [PPC64] Improved VSID allocation algorithm"

    Relevant Pages