|
@@ -641,14 +641,14 @@ static int xl_open(struct net_device *dev)
|
|
* Now to set up the Rx and Tx buffer structures
|
|
* Now to set up the Rx and Tx buffer structures
|
|
*/
|
|
*/
|
|
/* These MUST be on 8 byte boundaries */
|
|
/* 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) {
|
|
if (xl_priv->xl_tx_ring == NULL) {
|
|
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
|
|
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
|
|
dev->name);
|
|
dev->name);
|
|
free_irq(dev->irq,dev);
|
|
free_irq(dev->irq,dev);
|
|
return -ENOMEM;
|
|
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) {
|
|
if (xl_priv->xl_tx_ring == NULL) {
|
|
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
|
|
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
|
|
dev->name);
|
|
dev->name);
|
|
@@ -656,8 +656,6 @@ static int xl_open(struct net_device *dev)
|
|
kfree(xl_priv->xl_tx_ring);
|
|
kfree(xl_priv->xl_tx_ring);
|
|
return -ENOMEM;
|
|
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 */
|
|
/* Setup Rx Ring */
|
|
for (i=0 ; i < XL_RX_RING_SIZE ; i++) {
|
|
for (i=0 ; i < XL_RX_RING_SIZE ; i++) {
|