| Message ID | 9f8b974fadf646f9227bd1d5fe8e448081ec9b2b.1288925424.git.joe@perches.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
> -----Original Message----- > From: Joe Perches [mailto:joe@perches.com] > Sent: Thursday, November 04, 2010 8:08 PM > To: Jiri Kosina > Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, > Carolyn; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter P; > Duyck, Alexander H; Ronciak, John; e1000-devel@lists.sourceforge.net; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH 23/49] drivers/net/igbvf: Use vzalloc > > Signed-off-by: Joe Perches <joe@perches.com> > --- > drivers/net/igbvf/netdev.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c > index 28af019..08e7459 100644 > --- a/drivers/net/igbvf/netdev.c > +++ b/drivers/net/igbvf/netdev.c > @@ -429,10 +429,9 @@ int igbvf_setup_tx_resources(struct igbvf_adapter > *adapter, > int size; > > size = sizeof(struct igbvf_buffer) * tx_ring->count; > - tx_ring->buffer_info = vmalloc(size); > + tx_ring->buffer_info = vzalloc(size); > if (!tx_ring->buffer_info) > goto err; > - memset(tx_ring->buffer_info, 0, size); > > /* round up to nearest 4K */ > tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc); > @@ -469,10 +468,9 @@ int igbvf_setup_rx_resources(struct igbvf_adapter > *adapter, > int size, desc_len; > > size = sizeof(struct igbvf_buffer) * rx_ring->count; > - rx_ring->buffer_info = vmalloc(size); > + rx_ring->buffer_info = vzalloc(size); > if (!rx_ring->buffer_info) > goto err; > - memset(rx_ring->buffer_info, 0, size); > > desc_len = sizeof(union e1000_adv_rx_desc); > > -- > 1.7.3.1.g432b3.dirty Acked By: Greg Rose <Gregory.v.rose@intel.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 28af019..08e7459 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c @@ -429,10 +429,9 @@ int igbvf_setup_tx_resources(struct igbvf_adapter *adapter, int size; size = sizeof(struct igbvf_buffer) * tx_ring->count; - tx_ring->buffer_info = vmalloc(size); + tx_ring->buffer_info = vzalloc(size); if (!tx_ring->buffer_info) goto err; - memset(tx_ring->buffer_info, 0, size); /* round up to nearest 4K */ tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc); @@ -469,10 +468,9 @@ int igbvf_setup_rx_resources(struct igbvf_adapter *adapter, int size, desc_len; size = sizeof(struct igbvf_buffer) * rx_ring->count; - rx_ring->buffer_info = vmalloc(size); + rx_ring->buffer_info = vzalloc(size); if (!rx_ring->buffer_info) goto err; - memset(rx_ring->buffer_info, 0, size); desc_len = sizeof(union e1000_adv_rx_desc);
Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/igbvf/netdev.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)