FreeBSD Bugzilla – Attachment 154366 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]
Merge wpi_start() and wpi_start_locked()
patch-wpi55.diff (text/plain), 1.19 KB, created by
Andriy Voskoboinyk
on 2015-03-15 13:23:24 UTC
(
hide
)
Description:
Merge wpi_start() and wpi_start_locked()
Filename:
MIME Type:
Creator:
Andriy Voskoboinyk
Created:
2015-03-15 13:23:24 UTC
Size:
1.19 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) >@@ -198,7 +198,6 @@ > static int wpi_raw_xmit(struct ieee80211_node *, struct mbuf *, > const struct ieee80211_bpf_params *); > static void wpi_start(struct ifnet *); >-static void wpi_start_locked(struct ifnet *); > static void wpi_start_task(void *, int); > static void wpi_watchdog_rfkill(void *); > static void wpi_watchdog(void *); >@@ -2860,21 +2859,9 @@ > wpi_start(struct ifnet *ifp) > { > struct wpi_softc *sc = ifp->if_softc; >- >- WPI_LOCK(sc); >- wpi_start_locked(ifp); >- WPI_UNLOCK(sc); >-} >- >-static void >-wpi_start_locked(struct ifnet *ifp) >-{ >- struct wpi_softc *sc = ifp->if_softc; > struct ieee80211_node *ni; > struct mbuf *m; > >- WPI_LOCK_ASSERT(sc); >- > DPRINTF(sc, WPI_DEBUG_XMIT, "%s: called\n", __func__); > > IF_LOCK(&ifp->if_snd); >@@ -2885,6 +2872,7 @@ > } > IF_UNLOCK(&ifp->if_snd); > >+ WPI_LOCK(sc); > for (;;) { > if (sc->qfullmsk != 0) { > IF_LOCK(&ifp->if_snd); >@@ -2903,6 +2891,7 @@ > if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); > } > } >+ WPI_UNLOCK(sc); > > DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__); > }
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