From cf1a10dd1cf4660ce2df424c7b1f89acef76174e Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Thu, 3 Jul 2008 18:02:27 +0300
Subject: [PATCH] --- yaml --- r: 103361 b: refs/heads/master c:
 e4abd4d49d6df6d5e94564c5e831c61ac722f6ec h: refs/heads/master i:   103359:
 942a4f6e6c92c83b0b7ac3efe33f2f0058989b7e v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/wext.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 55c4655994c8..2431a7405df8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fdae6b37e9346dbaea1e51ed6235ed0269d445d
+refs/heads/master: e4abd4d49d6df6d5e94564c5e831c61ac722f6ec
diff --git a/trunk/net/mac80211/wext.c b/trunk/net/mac80211/wext.c
index 1babb979fe00..736c32e340f2 100644
--- a/trunk/net/mac80211/wext.c
+++ b/trunk/net/mac80211/wext.c
@@ -800,6 +800,8 @@ static int ieee80211_ioctl_siwfrag(struct net_device *dev,
 
 	if (frag->disabled)
 		local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
+	else if (!frag->fixed)
+		local->fragmentation_threshold = IEEE80211_MAX_FRAG_THRESHOLD;
 	else if (frag->value < 256 ||
 		 frag->value > IEEE80211_MAX_FRAG_THRESHOLD)
 		return -EINVAL;