Fix a misuse of ether_sprintf so that IBSS merges are printed
xx:xx:xx:xx:xx:xx -> yy:yy:yy:yy:yy:yy instead of xx:xx:xx:xx:xx:xx -> xx:xx:xx:xx:xx:xx.
This commit is contained in:
parent
ea0b1cb353
commit
a4bb6a73ed
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: ieee80211_input.c,v 1.36 2005/01/04 00:56:51 dyoung Exp $ */
|
/* $NetBSD: ieee80211_input.c,v 1.37 2005/01/16 11:36:54 dyoung Exp $ */
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 2001 Atsushi Onoe
|
* Copyright (c) 2001 Atsushi Onoe
|
||||||
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
|
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
#ifdef __FreeBSD__
|
#ifdef __FreeBSD__
|
||||||
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.20 2004/04/02 23:35:24 sam Exp $");
|
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.20 2004/04/02 23:35:24 sam Exp $");
|
||||||
#else
|
#else
|
||||||
__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.36 2005/01/04 00:56:51 dyoung Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.37 2005/01/16 11:36:54 dyoung Exp $");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "opt_inet.h"
|
#include "opt_inet.h"
|
||||||
|
@ -1623,11 +1623,11 @@ ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni)
|
||||||
|
|
||||||
printf("%s: bss merge %s -> ", ic->ic_if.if_xname,
|
printf("%s: bss merge %s -> ", ic->ic_if.if_xname,
|
||||||
ether_sprintf(ic->ic_bss->ni_bssid));
|
ether_sprintf(ic->ic_bss->ni_bssid));
|
||||||
printf("%s\n", ether_sprintf(ni->ni_bssid));
|
|
||||||
|
|
||||||
(*ic->ic_node_copy)(ic, ic->ic_bss, ni);
|
(*ic->ic_node_copy)(ic, ic->ic_bss, ni);
|
||||||
ieee80211_node_newstate(ic->ic_bss, IEEE80211_STA_BSS);
|
ieee80211_node_newstate(ic->ic_bss, IEEE80211_STA_BSS);
|
||||||
|
|
||||||
|
printf("%s\n", ether_sprintf(ic->ic_bss->ni_bssid));
|
||||||
return ENETRESET;
|
return ENETRESET;
|
||||||
}
|
}
|
||||||
#undef IEEE80211_VERIFY_LENGTH
|
#undef IEEE80211_VERIFY_LENGTH
|
||||||
|
|
Loading…
Reference in New Issue