aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211')
-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 d7761e95e4cf..b098c58d216f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1001,7 +1001,6 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
1001 if (tx->flags & IEEE80211_TX_FRAGMENTED) { 1001 if (tx->flags & IEEE80211_TX_FRAGMENTED) {
1002 if ((tx->flags & IEEE80211_TX_UNICAST) && 1002 if ((tx->flags & IEEE80211_TX_UNICAST) &&
1003 skb->len + FCS_LEN > local->fragmentation_threshold && 1003 skb->len + FCS_LEN > local->fragmentation_threshold &&
1004 !local->ops->set_frag_threshold &&
1005 !(info->flags & IEEE80211_TX_CTL_AMPDU)) 1004 !(info->flags & IEEE80211_TX_CTL_AMPDU))
1006 tx->flags |= IEEE80211_TX_FRAGMENTED; 1005 tx->flags |= IEEE80211_TX_FRAGMENTED;
1007 else 1006 else
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 4e1fdcfacb0c..fbeb927c116b 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -639,14 +639,6 @@ static int ieee80211_ioctl_siwfrag(struct net_device *dev,
639 local->fragmentation_threshold = frag->value & ~0x1; 639 local->fragmentation_threshold = frag->value & ~0x1;
640 } 640 }
641 641
642 /* If the wlan card performs fragmentation in hardware/firmware,
643 * configure it here */
644
645 if (local->ops->set_frag_threshold)
646 return local->ops->set_frag_threshold(
647 local_to_hw(local),
648 local->fragmentation_threshold);
649
650 return 0; 642 return 0;
651} 643}
652 644