diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.sbin/rtsold | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.sbin/rtsold')
| -rw-r--r-- | usr.sbin/rtsold/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/rtsold/Makefile.depend | 1 | ||||
| -rw-r--r-- | usr.sbin/rtsold/if.c | 5 | ||||
| -rw-r--r-- | usr.sbin/rtsold/probe.c | 1 | ||||
| -rw-r--r-- | usr.sbin/rtsold/rtsold.c | 1 |
5 files changed, 0 insertions, 10 deletions
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile index efc322c..a235dfb 100644 --- a/usr.sbin/rtsold/Makefile +++ b/usr.sbin/rtsold/Makefile @@ -21,7 +21,5 @@ SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c WARNS?= 3 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DPADD= ${LIBKVM} -LDADD= -lkvm .include <bsd.prog.mk> diff --git a/usr.sbin/rtsold/Makefile.depend b/usr.sbin/rtsold/Makefile.depend index 3820cc8..b68b4bb 100644 --- a/usr.sbin/rtsold/Makefile.depend +++ b/usr.sbin/rtsold/Makefile.depend @@ -11,7 +11,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libkvm \ .include <dirdeps.mk> diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c index 2bf946d..b8a90b6 100644 --- a/usr.sbin/rtsold/if.c +++ b/usr.sbin/rtsold/if.c @@ -38,7 +38,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_types.h> #include <net/route.h> #include <net/if_dl.h> @@ -248,9 +247,7 @@ lladdropt_length(struct sockaddr_dl *sdl) { switch (sdl->sdl_type) { case IFT_ETHER: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif return (ROUNDUP8(ETHER_ADDR_LEN + 2)); default: return (0); @@ -266,9 +263,7 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt) switch (sdl->sdl_type) { case IFT_ETHER: -#ifdef IFT_IEEE80211 case IFT_IEEE80211: -#endif ndopt->nd_opt_len = (ROUNDUP8(ETHER_ADDR_LEN + 2)) >> 3; addr = (char *)(ndopt + 1); memcpy(addr, LLADDR(sdl), ETHER_ADDR_LEN); diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c index 5ec54aa..89a1617a 100644 --- a/usr.sbin/rtsold/probe.c +++ b/usr.sbin/rtsold/probe.c @@ -40,7 +40,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <netinet/in.h> diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index a97b884..bba15bb 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -38,7 +38,6 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet/icmp6.h> |
