FreeBSD Bugzilla – Attachment 154338 Details for
Bug 197143
[wpi] [patch]: sync with iwn / OpenBSD wpi
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Move IBSS association processing to wpi_newassoc()
patch-wpi31.diff (text/plain), 2.16 KB, created by
Andriy Voskoboinyk
on 2015-03-15 12:14:00 UTC
(
hide
)
Description:
Move IBSS association processing to wpi_newassoc()
Filename:
MIME Type:
Creator:
Andriy Voskoboinyk
Created:
2015-03-15 12:14:00 UTC
Size:
2.16 KB
patch
obsolete
>Index: sys/dev/wpi/if_wpi.c >=================================================================== >--- sys/dev/wpi/if_wpi.c (revision 279775) >+++ sys/dev/wpi/if_wpi.c (working copy) >@@ -228,6 +228,7 @@ > static int wpi_auth(struct wpi_softc *, struct ieee80211vap *); > static void wpi_update_beacon(struct ieee80211vap *, int); > static int wpi_setup_beacon(struct wpi_softc *, struct ieee80211_node *); >+static void wpi_newassoc(struct ieee80211_node *, int); > static int wpi_run(struct wpi_softc *, struct ieee80211vap *); > static int wpi_key_alloc(struct ieee80211vap *, struct ieee80211_key *, > ieee80211_keyix *, ieee80211_keyix *); >@@ -500,6 +501,7 @@ > ic->ic_wme.wme_update = wpi_updateedca; > ic->ic_update_promisc = wpi_update_promisc; > ic->ic_update_mcast = wpi_update_mcast; >+ ic->ic_newassoc = wpi_newassoc; > ic->ic_scan_start = wpi_scan_start; > ic->ic_scan_end = wpi_scan_end; > ic->ic_set_channel = wpi_set_channel; >@@ -2563,20 +2565,6 @@ > if (ismcast || type != IEEE80211_FC0_TYPE_DATA) > tx.id = WPI_ID_BROADCAST; > else { >- if (wn->id == WPI_ID_UNDEFINED && >- (vap->iv_opmode == IEEE80211_M_IBSS || >- vap->iv_opmode == IEEE80211_M_AHDEMO)) { >- WPI_NT_LOCK(sc); >- error = wpi_add_ibss_node(sc, ni); >- WPI_NT_UNLOCK(sc); >- if (error != 0) { >- device_printf(sc->sc_dev, >- "%s: could not add IBSS node, error %d\n", >- __func__, error); >- goto fail; >- } >- } >- > if (wn->id == WPI_ID_UNDEFINED) { > device_printf(sc->sc_dev, > "%s: undefined node id\n", __func__); >@@ -4019,6 +4007,28 @@ > WPI_UNLOCK(sc); > } > >+static void >+wpi_newassoc(struct ieee80211_node *ni, int isnew) >+{ >+ struct ieee80211vap *vap = ni->ni_vap; >+ struct wpi_softc *sc = ni->ni_ic->ic_ifp->if_softc; >+ struct wpi_node *wn = WPI_NODE(ni); >+ int error; >+ >+ WPI_NT_LOCK(sc); >+ >+ DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); >+ >+ if (vap->iv_opmode != IEEE80211_M_STA && wn->id == WPI_ID_UNDEFINED) { >+ if ((error = wpi_add_ibss_node(sc, ni)) != 0) { >+ device_printf(sc->sc_dev, >+ "%s: could not add IBSS node, error %d\n", >+ __func__, error); >+ } >+ } >+ WPI_NT_UNLOCK(sc); >+} >+ > static int > wpi_run(struct wpi_softc *sc, struct ieee80211vap *vap) > {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 197143
:
152282
|
152662
|
152977
|
153911
|
153977
|
153983
|
153985
|
153999
|
154000
|
154002
|
154006
|
154007
|
154009
|
154010
|
154011
|
154013
|
154015
|
154016
|
154017
|
154019
|
154020
|
154021
|
154022
|
154024
|
154026
|
154030
|
154032
|
154033
|
154328
|
154329
|
154330
|
154332
|
154334
|
154335
|
154336
|
154337
| 154338 |
154340
|
154341
|
154343
|
154346
|
154347
|
154348
|
154349
|
154350
|
154351
|
154352
|
154353
|
154354
|
154355
|
154356
|
154357
|
154358
|
154359
|
154360
|
154361
|
154362
|
154363
|
154364
|
154365
|
154366
|
154368
|
154369
|
154370
|
154371
|
154372
|
154373
|
154374
|
154375
|
154378
|
154379
|
154380
|
154381
|
154382
|
154383
|
154384
|
155332
|
155333
|
156164
|
156165
|
156166
|
156167
|
156168
|
156169
|
156170
|
156171
|
156172
|
156173
|
156174
|
156175
|
156176
|
156177
|
156178
|
156179
|
156180
|
156181
|
156182
|
156183
|
156184
|
156185
|
156186
|
156187
|
156188
|
156189
|
156190
|
156191
|
156192
|
156193
|
156194
|
156195