diff options
| author | Michael Brown | 2007-01-18 13:45:58 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-18 13:45:58 +0100 |
| commit | 06630a3036bc1a42696ba7f29235e75eddb4d562 (patch) | |
| tree | 6bf503c4e9d9be0c1e5ae077c89ec357a61685da /src/net | |
| parent | Respect the RX quota. This improves poll time by about 0.7us when the (diff) | |
| download | ipxe-06630a3036bc1a42696ba7f29235e75eddb4d562.tar.gz ipxe-06630a3036bc1a42696ba7f29235e75eddb4d562.tar.xz ipxe-06630a3036bc1a42696ba7f29235e75eddb4d562.zip | |
Switch from calloc() to malloc()+memset() to match the practices used
almost everywhere else.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/netdevice.c | 5 | ||||
| -rw-r--r-- | src/net/tcp.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/net/netdevice.c b/src/net/netdevice.c index 2827775b9..7ed678ace 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -178,9 +178,12 @@ struct pk_buff * netdev_rx_dequeue ( struct net_device *netdev ) { */ struct net_device * alloc_netdev ( size_t priv_size ) { struct net_device *netdev; + size_t total_len; - netdev = calloc ( 1, sizeof ( *netdev ) + priv_size ); + total_len = ( sizeof ( *netdev ) + priv_size ); + netdev = malloc ( total_len ); if ( netdev ) { + memset ( netdev, 0, total_len ); INIT_LIST_HEAD ( &netdev->references ); INIT_LIST_HEAD ( &netdev->tx_queue ); INIT_LIST_HEAD ( &netdev->rx_queue ); diff --git a/src/net/tcp.c b/src/net/tcp.c index 2df3d8af2..af5f2b064 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -149,9 +149,10 @@ tcp_dump_flags ( struct tcp_connection *conn, unsigned int flags ) { static struct tcp_connection * alloc_tcp ( void ) { struct tcp_connection *conn; - conn = calloc ( 1, sizeof ( *conn ) ); + conn = malloc ( sizeof ( *conn ) ); if ( conn ) { DBGC ( conn, "TCP %p allocated\n", conn ); + memset ( conn, 0, sizeof ( *conn ) ); conn->tcp_state = conn->prev_tcp_state = TCP_CLOSED; conn->snd_seq = random(); conn->timer.expired = tcp_expired; |