Author: ae
Date: Tue Apr 19 05:59:37 2011
New Revision: 220812
URL: http://svn.freebsd.org/changeset/base/220812
Log:
Use M_WAITOK instead M_WAIT for malloc. Remove unneded checks.
MFC after: 1 week
Modified:
head/sys/netinet/ipfw/ip_dummynet.c
Modified: head/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dummynet.c Tue Apr 19 05:09:17 2011
(r220811)
+++ head/sys/netinet/ipfw/ip_dummynet.c Tue Apr 19 05:59:37 2011
(r220812)
@@ -1836,9 +1836,7 @@ dummynet_get(struct sockopt *sopt, void
#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
have = need;
start = malloc(have, M_DUMMYNET, M_WAITOK | M_ZERO);
- if (start == NULL) {
- error = ENOMEM;
- goto done;
- }
}
if (start == NULL) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
