d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constify vap argument of ieee80211_{note,discard}* functions.

Browse Source 
MFC after:	1 week
This commit is contained in:
rpaulo 2010-03-31 16:07:36 +00:00
parent 968dcf13b5
commit 7baff87d11
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net80211/ieee80211_input.c
View File

@ -734,7 +734,8 @@ ieee80211_ssid_mismatch(struct ieee80211vap *vap, const char *tag,
* Return the bssid of a frame. * Return the bssid of a frame.
*/ */
static const uint8_t * static const uint8_t *
ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh) ieee80211_getbssid(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh)
{ {
if (vap->iv_opmode == IEEE80211_M_STA) if (vap->iv_opmode == IEEE80211_M_STA)
return wh->i_addr2; return wh->i_addr2;
@ -748,7 +749,7 @@ ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
#include <machine/stdarg.h> #include <machine/stdarg.h>
void void
ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...) ieee80211_note(const struct ieee80211vap *vap, const char *fmt, ...)
{ {
char buf[128]; /* XXX */ char buf[128]; /* XXX */
va_list ap; va_list ap;
@ -761,7 +762,7 @@ ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...)
} }
void void
ieee80211_note_frame(struct ieee80211vap *vap, ieee80211_note_frame(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh, const struct ieee80211_frame *wh,
const char *fmt, ...) const char *fmt, ...)
{ {
@ -776,7 +777,7 @@ ieee80211_note_frame(struct ieee80211vap *vap,
} }
void void
ieee80211_note_mac(struct ieee80211vap *vap, ieee80211_note_mac(const struct ieee80211vap *vap,
const uint8_t mac[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN],
const char *fmt, ...) const char *fmt, ...)
{ {
@ -790,7 +791,7 @@ ieee80211_note_mac(struct ieee80211vap *vap,
} }
void void
ieee80211_discard_frame(struct ieee80211vap *vap, ieee80211_discard_frame(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh, const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...) const char *type, const char *fmt, ...)
{ {
@ -811,7 +812,7 @@ ieee80211_discard_frame(struct ieee80211vap *vap,
} }
void void
ieee80211_discard_ie(struct ieee80211vap *vap, ieee80211_discard_ie(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh, const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...) const char *type, const char *fmt, ...)
{ {
@ -830,7 +831,7 @@ ieee80211_discard_ie(struct ieee80211vap *vap,
} }
void void
ieee80211_discard_mac(struct ieee80211vap *vap, ieee80211_discard_mac(const struct ieee80211vap *vap,
const uint8_t mac[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN],
const char *type, const char *fmt, ...) const char *type, const char *fmt, ...)
{ {

12
sys/net80211/ieee80211_var.h
View File

@ -852,10 +852,10 @@ ieee80211_htchanflags(const struct ieee80211_channel *c)
if (ieee80211_msg(_vap, _m)) \ if (ieee80211_msg(_vap, _m)) \
ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__); \ ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__); \
} while (0) } while (0)
void ieee80211_note(struct ieee80211vap *, const char *, ...); void ieee80211_note(const struct ieee80211vap *, const char *, ...);
void ieee80211_note_mac(struct ieee80211vap *, void ieee80211_note_mac(const struct ieee80211vap *,
const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...); const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
void ieee80211_note_frame(struct ieee80211vap *, void ieee80211_note_frame(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *, ...); const struct ieee80211_frame *, const char *, ...);
#define ieee80211_msg_debug(_vap) \ #define ieee80211_msg_debug(_vap) \
((_vap)->iv_debug & IEEE80211_MSG_DEBUG) ((_vap)->iv_debug & IEEE80211_MSG_DEBUG)
@ -893,11 +893,11 @@ void ieee80211_note_frame(struct ieee80211vap *,
ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\ ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
} while (0) } while (0)
void ieee80211_discard_frame(struct ieee80211vap *, void ieee80211_discard_frame(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *type, const char *fmt, ...); const struct ieee80211_frame *, const char *type, const char *fmt, ...);
void ieee80211_discard_ie(struct ieee80211vap *, void ieee80211_discard_ie(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *type, const char *fmt, ...); const struct ieee80211_frame *, const char *type, const char *fmt, ...);
void ieee80211_discard_mac(struct ieee80211vap *, void ieee80211_discard_mac(const struct ieee80211vap *,
const uint8_t mac[IEEE80211_ADDR_LEN], const char *type, const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
const char *fmt, ...); const char *fmt, ...);
#else #else