build - Fixup world/kernel build

* Fixup the world/kernel build for 64 bit etc.  Cleanup recent work.

diff --git a/sys/netproto/802_11/ieee80211_input.h b/sys/netproto/802_11/ieee80211_input.h
index 011b404..8f99734 100644 (file)
--- a/sys/netproto/802_11/ieee80211_input.h
+++ b/sys/netproto/802_11/ieee80211_input.h
@@ -53,10 +53,11 @@
        }                                                               \
 } while (0)
 
-#ifdef IEEE80211_DEBUG
 void   ieee80211_ssid_mismatch(struct ieee80211vap *, const char *tag,
        uint8_t mac[IEEE80211_ADDR_LEN], uint8_t *ssid);
 
+#ifdef IEEE80211_DEBUG
+
 #define        IEEE80211_VERIFY_SSID(_ni, _ssid, _action) do {                 \
        if ((_ssid)[1] != 0 &&                                          \
            ((_ssid)[1] != (_ni)->ni_esslen ||                          \

diff --git a/sys/netproto/802_11/ieee80211_var.h b/sys/netproto/802_11/ieee80211_var.h
index 22e3207..44e21ac 100644 (file)
--- a/sys/netproto/802_11/ieee80211_var.h
+++ b/sys/netproto/802_11/ieee80211_var.h
@@ -839,6 +839,19 @@ ieee80211_htchanflags(const struct ieee80211_channel *c)
        "\23POWER\24STATE\25OUTPUT\26SCAN\27AUTH\30ASSOC\31NODE\32ELEMID" \
        "\33XRATE\34INPUT\35CRYPTO\36DUPMPKTS\37DEBUG\04011N"
 
+void   ieee80211_note(const struct ieee80211vap *, const char *, ...);
+void   ieee80211_note_mac(const struct ieee80211vap *,
+               const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
+void   ieee80211_note_frame(const struct ieee80211vap *,
+               const struct ieee80211_frame *, const char *, ...);
+void ieee80211_discard_frame(const struct ieee80211vap *,
+       const struct ieee80211_frame *, const char *type, const char *fmt, ...);
+void ieee80211_discard_ie(const struct ieee80211vap *,
+       const struct ieee80211_frame *, const char *type, const char *fmt, ...);
+void ieee80211_discard_mac(const struct ieee80211vap *,
+       const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
+       const char *fmt, ...);
+
 #ifdef IEEE80211_DEBUG
 #define        ieee80211_msg(_vap, _m) ((_vap)->iv_debug & (_m))
 #define        IEEE80211_DPRINTF(_vap, _m, _fmt, ...) do {                     \
@@ -857,11 +870,6 @@ ieee80211_htchanflags(const struct ieee80211_channel *c)
        if (ieee80211_msg(_vap, _m))                                    \
                ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__);     \
 } while (0)
-void   ieee80211_note(const struct ieee80211vap *, const char *, ...);
-void   ieee80211_note_mac(const struct ieee80211vap *,
-               const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
-void   ieee80211_note_frame(const struct ieee80211vap *,
-               const struct ieee80211_frame *, const char *, ...);
 #define        ieee80211_msg_debug(_vap) \
        ((_vap)->iv_debug & IEEE80211_MSG_DEBUG)
 #define        ieee80211_msg_dumppkts(_vap) \
@@ -898,13 +906,6 @@ void       ieee80211_note_frame(const struct ieee80211vap *,
                ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
 } while (0)
 
-void ieee80211_discard_frame(const struct ieee80211vap *,
-       const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_ie(const struct ieee80211vap *,
-       const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_mac(const struct ieee80211vap *,
-       const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
-       const char *fmt, ...);
 #else
 #define        IEEE80211_DPRINTF(_vap, _m, _fmt, ...)
 #define        IEEE80211_NOTE(_vap, _m, _ni, _fmt, ...)

diff --git a/sys/sys/iosched.h b/sys/sys/iosched.h
index 506fad8..7e34ed9 100644 (file)
--- a/sys/sys/iosched.h
+++ b/sys/sys/iosched.h
@@ -21,14 +21,14 @@
 #include <sys/systimer.h>
 #endif
 
+#endif /* _KERNEL || _KERNEL_STRUCTURES */
+
 struct iosched_data {
     size_t     iorbytes;
     size_t     iowbytes;
     int                lastticks;      /* decay last recorded */
 };
 
-#endif /* _KERNEL || _KERNEL_STRUCTURES */
-
 #ifdef _KERNEL
 
 struct thread;