Attachment 154033 Details for Bug 197143 – Wrap node addition in STA mode into wpi_add_sta_node()

[patch] Wrap node addition in STA mode into wpi_add_sta_node()

patch-wpi22.diff (text/plain), 1.60 KB, created by Andriy Voskoboinyk on 2015-03-08 19:19:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-08 19:19:35 UTC

Size: 1.60 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)
>@@ -1527,6 +1527,14 @@
> }
> 
> static __inline int
>+wpi_add_node_entry_sta(struct wpi_softc *sc)
>+{
>+	sc->nodesmsk |= 1 << WPI_ID_BSS;
>+
>+	return WPI_ID_BSS;
>+}
>+
>+static __inline int
> wpi_check_node_entry(struct wpi_softc *sc, uint8_t id)
> {
> 	if (id == WPI_ID_UNDEFINED)
>@@ -1570,7 +1578,7 @@
> 	struct wpi_softc *sc = ic->ic_ifp->if_softc;
> 	struct wpi_node *wn = WPI_NODE(ni);
> 
>-	if (wn->id >= WPI_ID_IBSS_MIN && wn->id <= WPI_ID_IBSS_MAX) {
>+	if (wn->id != WPI_ID_UNDEFINED) {
> 		WPI_LOCK(sc);
> 		if (wpi_check_node_entry(sc, wn->id)) {
> 			wpi_del_node_entry(sc, wn->id);
>@@ -3032,6 +3040,25 @@
> }
> 
> static int
>+wpi_add_sta_node(struct wpi_softc *sc, struct ieee80211_node *ni)
>+{
>+	struct wpi_node *wn = WPI_NODE(ni);
>+	int error;
>+
>+	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__);
>+
>+	wn->id = wpi_add_node_entry_sta(sc);
>+
>+	if ((error = wpi_add_node(sc, ni)) != 0) {
>+		wpi_del_node_entry(sc, wn->id);
>+		wn->id = WPI_ID_UNDEFINED;
>+		return error;
>+	}
>+
>+	return 0;
>+}
>+
>+static int
> wpi_add_ibss_node(struct wpi_softc *sc, struct ieee80211_node *ni)
> {
> 	struct wpi_node *wn = WPI_NODE(ni);
>@@ -4011,8 +4038,8 @@
> 
> 	if (vap->iv_opmode == IEEE80211_M_STA) {
> 		/* Add BSS node. */
>-		((struct wpi_node *)ni)->id = WPI_ID_BSS;
>-		if ((error = wpi_add_node(sc, ni)) != 0) {
>+		error = wpi_add_sta_node(sc, ni);
>+		if (error != 0) {
> 			device_printf(sc->sc_dev,
> 			    "%s: could not add BSS node, error %d\n", __func__,
> 			    error);

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