summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-12-09 11:30:03 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2008-12-12 19:01:33 (GMT)
commitf546638c3f809fdacddc03fe765669c3042e0d9d (patch)
tree2f5936ca90d2774ce33c03f96065ef561443af51 /net
parente4f2a3458f451d5fb6aa55aac6aaadcf220d0da1 (diff)
downloadlinux-f546638c3f809fdacddc03fe765669c3042e0d9d.tar.xz
mac80211: remove fragmentation offload functionality
There's no driver that actually does fragmentation on the device, and the callback is buggy (when it returns an error, mac80211's fragmentation status is changed so reading the frag threshold from userspace reads the new value despite the error). Let's just remove it, if we really find some hardware supporting it we can add it back later. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c1
-rw-r--r--net/mac80211/wext.c8
2 files changed, 0 insertions, 9 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d7761e9..b098c58 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1001,7 +1001,6 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
if (tx->flags & IEEE80211_TX_FRAGMENTED) {
if ((tx->flags & IEEE80211_TX_UNICAST) &&
skb->len + FCS_LEN > local->fragmentation_threshold &&
- !local->ops->set_frag_threshold &&
!(info->flags & IEEE80211_TX_CTL_AMPDU))
tx->flags |= IEEE80211_TX_FRAGMENTED;
else
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 4e1fdcf..fbeb927 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -639,14 +639,6 @@ static int ieee80211_ioctl_siwfrag(struct net_device *dev,
local->fragmentation_threshold = frag->value & ~0x1;
}
- /* If the wlan card performs fragmentation in hardware/firmware,
- * configure it here */
-
- if (local->ops->set_frag_threshold)
- return local->ops->set_frag_threshold(
- local_to_hw(local),
- local->fragmentation_threshold);
-
return 0;
}