---

yaml --- r: 103361 b: refs/heads/master c: e4abd4d h: refs/heads/master i: 103359: 942a4f6 v: v3
git-mirror · Jul 8, 2008 · cf1a10d · cf1a10d
1 parent 68a773d
commit cf1a10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;