Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c821d55c authored by Surya Prabhakar N's avatar Surya Prabhakar N Committed by David S. Miller
Browse files

drivers/net/tokenring/3c359.c 



Hi,
   Replacing kmalloc with kzalloc and cleaning up memset in
drivers/net/tokenring/3c359.c

Signed-off-by: default avatarSurya Prabhakar <surya.prabhakar@wipro.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b1c9e0f7

drivers/net/tokenring/3c359.c

+2 −4
Original line number Diff line number Diff line
@@ -641,14 +641,14 @@ static int xl_open(struct net_device *dev) 
	 * Now to set up the Rx and Tx buffer structures

	 */

	/* These MUST be on 8 byte boundaries */

	xl_priv->xl_tx_ring = kmalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL) ; 

	xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);

	if (xl_priv->xl_tx_ring == NULL) {

		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",

				     dev->name);

		free_irq(dev->irq,dev);

		return -ENOMEM;

	}

	xl_priv->xl_rx_ring = kmalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL) ; 

	xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);

	if (xl_priv->xl_tx_ring == NULL) {

		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",

				     dev->name);
@@ -656,8 +656,6 @@ static int xl_open(struct net_device *dev) 
		kfree(xl_priv->xl_tx_ring);

		return -ENOMEM;

	}

	memset(xl_priv->xl_tx_ring,0,sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) ; 

	memset(xl_priv->xl_rx_ring,0,sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) ; 



	 /* Setup Rx Ring */

	 for (i=0 ; i < XL_RX_RING_SIZE ; i++) {