diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-19 18:14:36 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-19 18:14:36 +0000 |
| commit | b041683495b1a7125fc400234f0d6485d6d69298 (patch) | |
| tree | 20ed48ab03d54f43bb0818ffe4907202da130d29 | |
| parent | f5e3d2e45aca83d67335f2fa1463e619780ff288 (diff) | |
use ieee80211_add_ssid() in ieee80211_beacon_alloc() and wpi(4) instead
of duplicating the code.
last commit was ok reyk@
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 8 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 1a032d13f72..13998c0221d 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.3 2006/05/17 19:50:35 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.4 2006/05/19 18:14:35 damien Exp $ */ /*- * Copyright (c) 2006 @@ -1850,11 +1850,7 @@ wpi_scan(struct wpi_softc *sc) frm = (uint8_t *)(wh + 1); /* add essid IE */ - /* frm = ieee80211_add_ssid(frm, ni->ni_essid, ni->ni_esslen);*/ - *frm++ = IEEE80211_ELEMID_SSID; - *frm++ = ni->ni_esslen; - bcopy(ni->ni_essid, frm, ni->ni_esslen); - frm += ni->ni_esslen; + frm = ieee80211_add_ssid(frm, ni->ni_essid, ni->ni_esslen); mode = ieee80211_chan2mode(ic, ic->ic_ibss_chan); rs = &ic->ic_sup_rates[mode]; diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 131d047bfd7..510eab75d7e 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.17 2006/05/19 18:06:51 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.18 2006/05/19 18:14:35 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -935,10 +935,7 @@ ieee80211_beacon_alloc(struct ieee80211com *ic, struct ieee80211_node *ni) capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; *(u_int16_t *)frm = htole16(capinfo); frm += 2; - *frm++ = IEEE80211_ELEMID_SSID; - *frm++ = ni->ni_esslen; - memcpy(frm, ni->ni_essid, ni->ni_esslen); - frm += ni->ni_esslen; + frm = ieee80211_add_ssid(frm, ni->ni_essid, ni->ni_esslen); frm = ieee80211_add_rates(frm, rs); *frm++ = IEEE80211_ELEMID_DSPARMS; *frm++ = 1; |