FreeBSD Bugzilla – Attachment 154011 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 correct pointer for wpi_softc
patch-wpi9.diff (text/plain), 841 bytes, created by
Andriy Voskoboinyk
on 2015-03-08 13:09:26 UTC
(
hide
)
Description:
Use correct pointer for wpi_softc
Filename:
MIME Type:
Creator:
Andriy Voskoboinyk
Created:
2015-03-08 13:09:26 UTC
Size:
841 bytes
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) >@@ -3850,9 +3850,8 @@ > static void > wpi_update_beacon(struct ieee80211vap *vap, int item) > { >+ struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc; > struct ieee80211_node *ni = vap->iv_bss; >- struct ifnet *ifp = vap->iv_ifp; >- struct wpi_softc *sc = ifp->if_softc; > int error; > > WPI_LOCK(sc); >@@ -3970,8 +3969,7 @@ > wpi_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, > ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix) > { >- struct ifnet *ifp = vap->iv_ifp; >- struct wpi_softc *sc = ifp->if_softc; >+ struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc; > > if (!(&vap->iv_nw_keys[0] <= k && > k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=154011">View the attachment on a separate page</a>.</b>
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
Working