From 5497242600c8bf1bc1381455d7401b2e4addc051 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 11 Jan 2007 17:32:54 +0800 Subject: [PATCH] --- yaml --- r: 46503 b: refs/heads/master c: ea8862dc86c0f5a0be012a0f2e9de1b2ccabbaa5 h: refs/heads/master i: 46501: f345aaa7d74d2308c4ae6e88c499a3e90b7b67b5 46499: d441c46c53b6c1dded75eaea3efc957ac43cc0c5 46495: 33cfefadc26f754e195e533103ff9f9667ac8eb8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2200.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 45d297bd035a..5329026968c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e9b2467de69733c9ac455e261aef302d288fb17 +refs/heads/master: ea8862dc86c0f5a0be012a0f2e9de1b2ccabbaa5 diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c index 22cb3fb7502e..c878a2f3239c 100644 --- a/trunk/drivers/net/wireless/ipw2200.c +++ b/trunk/drivers/net/wireless/ipw2200.c @@ -9166,7 +9166,7 @@ static int ipw_wx_set_rts(struct net_device *dev, { struct ipw_priv *priv = ieee80211_priv(dev); mutex_lock(&priv->mutex); - if (wrqu->rts.disabled) + if (wrqu->rts.disabled || !wrqu->rts.fixed) priv->rts_threshold = DEFAULT_RTS_THRESHOLD; else { if (wrqu->rts.value < MIN_RTS_THRESHOLD || @@ -9255,7 +9255,7 @@ static int ipw_wx_set_frag(struct net_device *dev, { struct ipw_priv *priv = ieee80211_priv(dev); mutex_lock(&priv->mutex); - if (wrqu->frag.disabled) + if (wrqu->frag.disabled || !wrqu->frag.fixed) priv->ieee->fts = DEFAULT_FTS; else { if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||