Commit 9c59cc79 authored by Allen Pais's avatar Allen Pais Committed by David S. Miller
Browse files

net: alteon: convert tasklets to use new tasklet_setup() API 



In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e059c6f3

drivers/net/ethernet/alteon/acenic.c

+5 −4
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ static int acenic_probe_one(struct pci_dev *pdev, 
	SET_NETDEV_DEV(dev, &pdev->dev);



	ap = netdev_priv(dev);

	ap->ndev = dev;

	ap->pdev = pdev;

	ap->name = pci_name(pdev);
@@ -1562,10 +1563,10 @@ static void ace_watchdog(struct net_device *data, unsigned int txqueue) 
}





static void ace_tasklet(unsigned long arg)

static void ace_tasklet(struct tasklet_struct *t)

{

	struct net_device *dev = (struct net_device *) arg;

	struct ace_private *ap = netdev_priv(dev);

	struct ace_private *ap = from_tasklet(ap, t, ace_tasklet);

	struct net_device *dev = ap->ndev;

	int cur_size;



	cur_size = atomic_read(&ap->cur_rx_bufs);
@@ -2269,7 +2270,7 @@ static int ace_open(struct net_device *dev) 
	/*

	 * Setup the bottom half rx ring refill handler

	 */

	tasklet_init(&ap->ace_tasklet, ace_tasklet, (unsigned long)dev);

	tasklet_setup(&ap->ace_tasklet, ace_tasklet);

	return 0;

}

drivers/net/ethernet/alteon/acenic.h

+2 −1
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ struct ace_skb 
 */

struct ace_private

{

	struct net_device	*ndev;		/* backpointer */

	struct ace_info		*info;

	struct ace_regs	__iomem	*regs;		/* register base */

	struct ace_skb		*skb;
@@ -776,7 +777,7 @@ static int ace_open(struct net_device *dev); 
static netdev_tx_t ace_start_xmit(struct sk_buff *skb,

				  struct net_device *dev);

static int ace_close(struct net_device *dev);

static void ace_tasklet(unsigned long dev);

static void ace_tasklet(struct tasklet_struct *t);

static void ace_dump_trace(struct ace_private *ap);

static void ace_set_multicast_list(struct net_device *dev);

static int ace_change_mtu(struct net_device *dev, int new_mtu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE