diff options
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 0bd4dfa59a8a..18ebd602670d 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -3467,10 +3467,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) | |||
3467 | dma_addr_t p; | 3467 | dma_addr_t p; |
3468 | 3468 | ||
3469 | priv->msg_buffers = | 3469 | priv->msg_buffers = |
3470 | (struct ipw2100_tx_packet *)kmalloc(IPW_COMMAND_POOL_SIZE * | 3470 | kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet), |
3471 | sizeof(struct | 3471 | GFP_KERNEL); |
3472 | ipw2100_tx_packet), | ||
3473 | GFP_KERNEL); | ||
3474 | if (!priv->msg_buffers) { | 3472 | if (!priv->msg_buffers) { |
3475 | printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg " | 3473 | printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg " |
3476 | "buffers.\n", priv->net_dev->name); | 3474 | "buffers.\n", priv->net_dev->name); |
@@ -4499,10 +4497,8 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv) | |||
4499 | } | 4497 | } |
4500 | 4498 | ||
4501 | priv->tx_buffers = | 4499 | priv->tx_buffers = |
4502 | (struct ipw2100_tx_packet *)kmalloc(TX_PENDED_QUEUE_LENGTH * | 4500 | kmalloc(TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet), |
4503 | sizeof(struct | 4501 | GFP_ATOMIC); |
4504 | ipw2100_tx_packet), | ||
4505 | GFP_ATOMIC); | ||
4506 | if (!priv->tx_buffers) { | 4502 | if (!priv->tx_buffers) { |
4507 | printk(KERN_ERR DRV_NAME | 4503 | printk(KERN_ERR DRV_NAME |
4508 | ": %s: alloc failed form tx buffers.\n", | 4504 | ": %s: alloc failed form tx buffers.\n", |
@@ -4651,9 +4647,9 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv) | |||
4651 | /* | 4647 | /* |
4652 | * allocate packets | 4648 | * allocate packets |
4653 | */ | 4649 | */ |
4654 | priv->rx_buffers = (struct ipw2100_rx_packet *) | 4650 | priv->rx_buffers = kmalloc(RX_QUEUE_LENGTH * |
4655 | kmalloc(RX_QUEUE_LENGTH * sizeof(struct ipw2100_rx_packet), | 4651 | sizeof(struct ipw2100_rx_packet), |
4656 | GFP_KERNEL); | 4652 | GFP_KERNEL); |
4657 | if (!priv->rx_buffers) { | 4653 | if (!priv->rx_buffers) { |
4658 | IPW_DEBUG_INFO("can't allocate rx packet buffer table\n"); | 4654 | IPW_DEBUG_INFO("can't allocate rx packet buffer table\n"); |
4659 | 4655 | ||