---

yaml
---
r: 46503
b: refs/heads/master
c: ea8862d
h: refs/heads/master
i:
  46501: f345aaa
  46499: d441c46
  46495: 33cfefa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e9b2467de69733c9ac455e261aef302d288fb17
+refs/heads/master: ea8862dc86c0f5a0be012a0f2e9de1b2ccabbaa5

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 ||