diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-26 21:19:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-26 21:19:19 +0000 |
| commit | dfd7168f692c1682b86ba973e4dda1f2c68e5070 (patch) | |
| tree | 932d285f115c6ff8bfd6959ec45c156466746af4 | |
| parent | 3e64b3e15c078e2d6f4ac92417aca915855f8c91 (diff) | |
Don't set WI_RID_OWN_SSID based on wi_net_name if wi_net_name is
not actually set. Closed PR #2569.
| -rw-r--r-- | sys/dev/ic/if_wi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index 4cf7d7b8ca2..72736734654 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.57 2002/04/26 19:20:27 millert Exp $ */ +/* $OpenBSD: if_wi.c,v 1.58 2002/04/26 21:19:18 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -124,7 +124,7 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) && !defined(__OpenBSD__) static const char rcsid[] = - "$OpenBSD: if_wi.c,v 1.57 2002/04/26 19:20:27 millert Exp $"; + "$OpenBSD: if_wi.c,v 1.58 2002/04/26 21:19:18 millert Exp $"; #endif /* lint */ #ifdef foo @@ -1580,8 +1580,8 @@ wi_init(sc) WI_SETSTR(WI_RID_DESIRED_SSID, sc->wi_net_name); /* Specify the IBSS name */ - if ((sc->wi_create_ibss && sc->wi_ptype == WI_PORTTYPE_IBSS) || - sc->wi_ptype == WI_PORTTYPE_AP) + if (sc->wi_net_name.i_len != 0 && (sc->wi_ptype == WI_PORTTYPE_AP || + (sc->wi_create_ibss && sc->wi_ptype == WI_PORTTYPE_IBSS))) WI_SETSTR(WI_RID_OWN_SSID, sc->wi_net_name); else WI_SETSTR(WI_RID_OWN_SSID, sc->wi_ibss_name); |