diff --git a/[refs] b/[refs]
index ff3f03def12f..7addb004541c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14a7dd6f6c1e0b361a37b6df52d4dc2ea36757d2
+refs/heads/master: fa6adfe9e625a6a843a1abed5f4e7a000c11952c
diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c
index f47d13bdf7f7..3cbaf5301d00 100644
--- a/trunk/net/mac80211/wext.c
+++ b/trunk/net/mac80211/wext.c
@@ -721,6 +721,9 @@ static int ieee80211_ioctl_siwrts(struct net_device *dev,
 
 	if (rts->disabled)
 		local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
+	else if (!rts->fixed)
+		/* if the rts value is not fixed, then take default */
+		local->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
 	else if (rts->value < 0 || rts->value > IEEE80211_MAX_RTS_THRESHOLD)
 		return -EINVAL;
 	else