From 0b19ae84dc05d38e3a61758dda2d965835b6f456 Mon Sep 17 00:00:00 2001 From: stsp Date: Tue, 13 Oct 2015 14:36:15 +0000 Subject: [PATCH] Don't use exp2f(), it breaks build on vax. Use a shift instead. reported by deraadt@ --- usr.sbin/tcpdump/Makefile | 4 ++-- usr.sbin/tcpdump/print-802_11.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index 6b4c89c7319..0a50b6c4f17 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2015/10/10 07:52:30 stsp Exp $ +# $OpenBSD: Makefile,v 1.58 2015/10/13 14:36:15 stsp Exp $ # # Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 # The Regents of the University of California. All rights reserved. @@ -30,7 +30,7 @@ CFLAGS+=-I${.CURDIR}/../../lib/libpcap CFLAGS+=-DCSLIP -DPPP -DHAVE_FDDI -DETHER_SERVICE -DRETSIGTYPE=void -DHAVE_NET_SLIP_H -DHAVE_ETHER_NTOHOST -DINET6 -LDADD+= -lpcap -ll -lcrypto -lm +LDADD+= -lpcap -ll -lcrypto DPADD+= ${LIBL} ${LIBPCAP} ${LIBCRYPTO} SRCS= tcpdump.c addrtoname.c privsep.c privsep_fdpass.c privsep_pcap.c \ diff --git a/usr.sbin/tcpdump/print-802_11.c b/usr.sbin/tcpdump/print-802_11.c index 8438334270c..01a0770a85e 100644 --- a/usr.sbin/tcpdump/print-802_11.c +++ b/usr.sbin/tcpdump/print-802_11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-802_11.c,v 1.26 2015/10/12 13:01:50 stsp Exp $ */ +/* $OpenBSD: print-802_11.c,v 1.27 2015/10/13 14:36:15 stsp Exp $ */ /* * Copyright (c) 2005 Reyk Floeter @@ -33,7 +33,6 @@ #include #include #include -#include #include "addrtoname.h" #include "interface.h" @@ -364,7 +363,7 @@ ieee80211_print_htcaps(u_int8_t *data, u_int len) if ((ampdu & IEEE80211_AMPDU_PARAM_LE) >= 0 && (ampdu & IEEE80211_AMPDU_PARAM_LE) <= 3) printf(",A-MPDU max %d", - (int)(exp2f(13 + (ampdu & IEEE80211_AMPDU_PARAM_LE)) - 1)); + (1 << (13 + (ampdu & IEEE80211_AMPDU_PARAM_LE))) - 1); /* A-MPDU start spacing */ if (ampdu & IEEE80211_AMPDU_PARAM_SS) { -- 2.20.1