mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 14:31:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add parent device to debug output lines from ieee80211_* debug functions.

Browse Source 
Add VAP mac address to debug output lines from ieee80211_* debug functions.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2880 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mtaylor 2007-11-21 09:15:37 +00:00
parent c717e369fd
commit 12aa3fb33e
1 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
net80211/ieee80211_input.c
View File

@ -60,6 +60,8 @@
#include <net80211/ieee80211_var.h>
#ifdef IEEE80211_DEBUG
#define BUF_LEN 192
/*
* Decide if a received management frame should be
* printed when debugging is enabled. This filters some
@ -3734,14 +3736,17 @@ ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
void
ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
printk("%s: %s", vap->iv_dev->name, buf); /* NB: no \n */
printk("%s/%s[%s]: %s",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
buf); /* NB: no \n */
}
EXPORT_SYMBOL(ieee80211_note);
@ -3749,13 +3754,15 @@ void
ieee80211_note_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
printk("%s: [%s] %s\n", vap->iv_dev->name,
printk("%s/%s[%s]: %s %s\n",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
ether_sprintf(ieee80211_getbssid(vap, wh)), buf);
}
EXPORT_SYMBOL(ieee80211_note_frame);
@ -3764,13 +3771,16 @@ void
ieee80211_note_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN],
const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
printk("%s: [%s] %s\n", vap->iv_dev->name, ether_sprintf(mac), buf);
printk("%s/%s[%s]: %s %s\n",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
ether_sprintf(mac), buf);
}
EXPORT_SYMBOL(ieee80211_note_mac);
@ -3778,55 +3788,56 @@ static void
ieee80211_discard_frame(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
if (type != NULL)
printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name,
ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf);
else
printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name,
ether_sprintf(ieee80211_getbssid(vap, wh)), buf);
printk("%s/%s[%s]: %s discard %s%sframe, %s\n",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
ether_sprintf(ieee80211_getbssid(vap, wh)),
(type != NULL) ? type : "",
(type != NULL) ? " " : "",
buf);
}
static void
ieee80211_discard_ie(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
if (type != NULL)
printk("[%s:%s] discard %s information element, %s\n",
vap->iv_dev->name,
ether_sprintf(ieee80211_getbssid(vap, wh)), type, buf);
else
printk("[%s:%s] discard information element, %s\n",
vap->iv_dev->name,
ether_sprintf(ieee80211_getbssid(vap, wh)), buf);
printk("%s/%s[%s]: %s discard %s%sinformation element, %s\n",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
ether_sprintf(ieee80211_getbssid(vap, wh)),
(type != NULL) ? type : "",
(type != NULL) ? " " : "",
buf);
}
static void
ieee80211_discard_mac(struct ieee80211vap *vap, const u_int8_t mac[IEEE80211_ADDR_LEN],
const char *type, const char *fmt, ...)
{
char buf[128]; /* XXX */
char buf[BUF_LEN];
va_list ap;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
if (type != NULL)
printk("[%s:%s] discard %s frame, %s\n", vap->iv_dev->name,
ether_sprintf(mac), type, buf);
else
printk("[%s:%s] discard frame, %s\n", vap->iv_dev->name,
ether_sprintf(mac), buf);
printk("%s/%s[%s]: %s discard %s%sframe, %s\n",
VAP_IC_DEV_NAME(vap), VAP_DEV_NAME(vap),
ether_sprintf(vap->iv_myaddr),
ether_sprintf(mac),
(type != NULL) ? type : "",
(type != NULL) ? " " : "",
buf);
}
#endif /* IEEE80211_DEBUG */