diff options
| author | Michael Brown | 2007-08-23 22:51:57 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-08-23 22:51:57 +0200 |
| commit | 746d0f8febe166a3d5bad03a84ca4e33d1bcfe34 (patch) | |
| tree | 8fb0d6d2d7066bdbc54f3540fa9564c0ad290127 /src/net | |
| parent | Auto-assign drive number only if set to 0xff; almost all applications (diff) | |
| parent | use malloc attribute (diff) | |
| download | ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.gz ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.xz ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.zip | |
Merge commit 'holger/strings'
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ipv4.c | 7 | ||||
| -rw-r--r-- | src/net/ipv6.c | 9 | ||||
| -rw-r--r-- | src/net/tls.c | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/net/ipv4.c b/src/net/ipv4.c index 35341b3d7..2f50f0e4e 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -39,10 +39,9 @@ static LIST_HEAD ( frag_buffers ); * @v gateway Gateway address (or @c INADDR_NONE for no gateway) * @ret miniroute Routing table entry, or NULL */ -static struct ipv4_miniroute * add_ipv4_miniroute ( struct net_device *netdev, - struct in_addr address, - struct in_addr netmask, - struct in_addr gateway ) { +static struct ipv4_miniroute * __malloc +add_ipv4_miniroute ( struct net_device *netdev, struct in_addr address, + struct in_addr netmask, struct in_addr gateway ) { struct ipv4_miniroute *miniroute; DBG ( "IPv4 add %s", inet_ntoa ( address ) ); diff --git a/src/net/ipv6.c b/src/net/ipv6.c index a91cb0690..c07ff94cc 100644 --- a/src/net/ipv6.c +++ b/src/net/ipv6.c @@ -52,11 +52,10 @@ static LIST_HEAD ( miniroutes ); * @v gateway Gateway address (or ::0 for no gateway) * @ret miniroute Routing table entry, or NULL */ -static struct ipv6_miniroute * add_ipv6_miniroute ( struct net_device *netdev, - struct in6_addr prefix, - int prefix_len, - struct in6_addr address, - struct in6_addr gateway ) { +static struct ipv6_miniroute * __malloc +add_ipv6_miniroute ( struct net_device *netdev, struct in6_addr prefix, + int prefix_len, struct in6_addr address, + struct in6_addr gateway ) { struct ipv6_miniroute *miniroute; miniroute = malloc ( sizeof ( *miniroute ) ); diff --git a/src/net/tls.c b/src/net/tls.c index 64e44b55d..5c201b32f 100644 --- a/src/net/tls.c +++ b/src/net/tls.c @@ -1044,7 +1044,7 @@ static void tls_hmac ( struct tls_session *tls __unused, * @ret plaintext_len Length of plaintext record * @ret plaintext Allocated plaintext record */ -static void * tls_assemble_stream ( struct tls_session *tls, +static void * __malloc tls_assemble_stream ( struct tls_session *tls, const void *data, size_t len, void *digest, size_t *plaintext_len ) { size_t mac_len = tls->tx_cipherspec.digest->digestsize; |