d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use M_WAITOK instead M_WAIT for malloc. Remove unneded checks.

Browse Source 
MFC after:	1 week
This commit is contained in:
ae 2011-04-19 05:59:37 +00:00
parent 63db62466c
commit 349e4f52c1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/ipfw/ip_dummynet.c
View File

@ -1836,9 +1836,7 @@ dummynet_get(struct sockopt *sopt, void **compat)
#endif
if (l > sizeof(r)) {
/* request larger than default, allocate buffer */
cmd = malloc(l, M_DUMMYNET, M_WAIT);
if (cmd == NULL)
return ENOMEM; //XXX
cmd = malloc(l, M_DUMMYNET, M_WAITOK);
error = sooptcopyin(sopt, cmd, l, l);
sopt->sopt_valsize = sopt_valsize;
if (error)
@ -1894,10 +1892,6 @@ dummynet_get(struct sockopt *sopt, void **compat)
have = need;
start = malloc(have, M_DUMMYNET, M_WAITOK | M_ZERO);
if (start == NULL) {
error = ENOMEM;
goto done;
}
}
if (start == NULL) {