Module Name: src
Committed By: roy
Date: Fri Feb 4 15:09:22 UTC 2011
Modified Files:
src/usr.bin/rump_dhcpclient: if-bsd.c
Log Message:
Work with the new routing.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/if-bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_dhcpclient/if-bsd.c
diff -u src/usr.bin/rump_dhcpclient/if-bsd.c:1.1 src/usr.bin/rump_dhcpclient/if-bsd.c:1.2
--- src/usr.bin/rump_dhcpclient/if-bsd.c:1.1 Thu Jan 20 18:47:20 2011
+++ src/usr.bin/rump_dhcpclient/if-bsd.c Fri Feb 4 15:09:22 2011
@@ -62,10 +62,6 @@
#include "if-options.h"
#include "net.h"
-#define ROUNDUP(a) \
- ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-
/* FIXME: Why do we need to check for sa_family 255 */
#define COPYOUT(sin, sa) \
sin.s_addr = ((sa) != NULL) ? \
@@ -196,7 +192,7 @@
int retval = 0;
#define ADDSU(_su) { \
- l = ROUNDUP(_su.sa.sa_len); \
+ l = RT_ROUNDUP(_su.sa.sa_len); \
memcpy(bp, &(_su), l); \
bp += l; \
}
