Attachment 153995 Details for Bug 196264 – Patch-v2.diff

[patch] Patch-v2.diff

iwn-patch.diff (text/plain), 2.00 KB, created by Andriy Voskoboinyk on 2015-03-08 09:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-08 09:46:20 UTC

Size: 2.00 KB

patch

obsolete

>Index: sys/dev/iwn/if_iwn.c
>===================================================================
>--- sys/dev/iwn/if_iwn.c	(revision 278764)
>+++ sys/dev/iwn/if_iwn.c	(working copy)
>@@ -1875,7 +1875,7 @@
> 		    &paddr, BUS_DMA_NOWAIT);
> 		if (error != 0 && error != EFBIG) {
> 			device_printf(sc->sc_dev,
>-			    "%s: can't not map mbuf, error %d\n", __func__,
>+			    "%s: can't map mbuf, error %d\n", __func__,
> 			    error);
> 			goto fail;
> 		}
>@@ -4047,8 +4047,10 @@
> 		r2 = 0;	/* Unused. */
> 	} else {
> 		r1 = IWN_READ(sc, IWN_INT);
>-		if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0)
>+		if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0) {
>+			IWN_UNLOCK(sc);
> 			return;	/* Hardware gone! */
>+		}
> 		r2 = IWN_READ(sc, IWN_FH_INT);
> 	}
> 
>@@ -4519,7 +4521,7 @@
> 			return error;
> 		}
> 		/* Too many DMA segments, linearize mbuf. */
>-		m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER);
>+		m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER - 1);
> 		if (m1 == NULL) {
> 			device_printf(sc->sc_dev,
> 			    "%s: could not defrag mbuf\n", __func__);
>@@ -4725,7 +4727,7 @@
> 			return error;
> 		}
> 		/* Too many DMA segments, linearize mbuf. */
>-		m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER);
>+		m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER - 1);
> 		if (m1 == NULL) {
> 			device_printf(sc->sc_dev,
> 			    "%s: could not defrag mbuf\n", __func__);
>@@ -4950,7 +4952,6 @@
> 		IWN_LOCK(sc);
> 		memset(&sc->last_stat, 0, sizeof(struct iwn_stats));
> 		IWN_UNLOCK(sc);
>-		error = 0;
> 		break;
> 	default:
> 		error = EINVAL;
>@@ -6818,16 +6819,10 @@
> 	chan->active = htole16(dwell_active);
> 	chan->passive = htole16(dwell_passive);
> 
>-	if (IEEE80211_IS_CHAN_5GHZ(c) &&
>-	    !(c->ic_flags & IEEE80211_CHAN_PASSIVE)) {
>+	if (IEEE80211_IS_CHAN_5GHZ(c))
> 		chan->rf_gain = 0x3b;
>-	} else if (IEEE80211_IS_CHAN_5GHZ(c)) {
>-		chan->rf_gain = 0x3b;
>-	} else if (!(c->ic_flags & IEEE80211_CHAN_PASSIVE)) {
>+	else
> 		chan->rf_gain = 0x28;
>-	} else {
>-		chan->rf_gain = 0x28;
>-	}
> 
> 	DPRINTF(sc, IWN_DEBUG_STATE,
> 	    "%s: chan %u flags 0x%x rf_gain 0x%x "

Actions: View | Diff

Attachments on bug 196264: 150952 | 153892 | 153995 | 153996 | 156730