FreeBSD Bugzilla – Attachment 156171 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]
Use another workaround for scanning
patch-wpi80.diff (text/plain), 1.82 KB, created by
Andriy Voskoboinyk
on 2015-04-30 20:57:32 UTC
(
hide
)
Description:
Use another workaround for scanning
Filename:
MIME Type:
Creator:
Andriy Voskoboinyk
Created:
2015-04-30 20:57:32 UTC
Size:
1.82 KB
patch
obsolete
>Index: sys/dev/wpi/if_wpi.c >=================================================================== >--- sys/dev/wpi/if_wpi.c (revision 281839) >+++ sys/dev/wpi/if_wpi.c (working copy) >@@ -516,7 +516,6 @@ > ic->ic_scan_start = wpi_scan_start; > ic->ic_scan_end = wpi_scan_end; > ic->ic_set_channel = wpi_set_channel; >- sc->sc_scan_curchan = ic->ic_scan_curchan; > ic->ic_scan_curchan = wpi_scan_curchan; > ic->ic_scan_mindwell = wpi_scan_mindwell; > ic->ic_setregdomain = wpi_setregdomain; >@@ -4020,6 +4019,20 @@ > chan->chan, IEEE80211_IS_CHAN_PASSIVE(c)); > > hdr->nchan++; >+ >+ if (hdr->nchan == 1 && sc->rxon.chan == chan->chan) { >+ /* XXX Force probe request transmission. */ >+ memcpy(chan + 1, chan, sizeof (struct wpi_scan_chan)); >+ >+ chan++; >+ >+ /* Reduce unnecessary delay. */ >+ chan->flags = 0; >+ chan->passive = chan->active = hdr->quiet_time; >+ >+ hdr->nchan++; >+ } >+ > chan++; > > buflen = (uint8_t *)chan - buf; >@@ -5400,16 +5413,10 @@ > int error; > > WPI_RXON_LOCK(sc); >- if (sc->rxon.chan != ieee80211_chan2ieee(ic, ic->ic_curchan)) { >- error = wpi_scan(sc, ic->ic_curchan); >- WPI_RXON_UNLOCK(sc); >- if (error != 0) >- ieee80211_cancel_scan(vap); >- } else { >- WPI_RXON_UNLOCK(sc); >- /* Send probe request when associated. */ >- sc->sc_scan_curchan(ss, maxdwell); >- } >+ error = wpi_scan(sc, ic->ic_curchan); >+ WPI_RXON_UNLOCK(sc); >+ if (error != 0) >+ ieee80211_cancel_scan(vap); > } > > /** >Index: sys/dev/wpi/if_wpivar.h >=================================================================== >--- sys/dev/wpi/if_wpivar.h (revision 281839) >+++ sys/dev/wpi/if_wpivar.h (working copy) >@@ -210,8 +210,6 @@ > struct mtx nt_mtx; > > void (*sc_node_free)(struct ieee80211_node *); >- void (*sc_scan_curchan)(struct ieee80211_scan_state *, >- unsigned long); > > struct wpi_rx_radiotap_header sc_rxtap; > struct wpi_tx_radiotap_header sc_txtap;
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