diff options
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index aba45ca43da7..18542fba1f43 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -677,14 +677,6 @@ static inline u16 mwl8k_qos_setbit_ack(u16 qos, u8 ack_policy) | |||
677 | return (qos & qos_mask) | ((ack_policy & val_mask) << shift); | 677 | return (qos & qos_mask) | ((ack_policy & val_mask) << shift); |
678 | } | 678 | } |
679 | 679 | ||
680 | static inline u16 mwl8k_qos_setbit_amsdu(u16 qos) | ||
681 | { | ||
682 | u16 val_mask = 1 << 7; | ||
683 | |||
684 | /* AMSDU present Bit 7 */ | ||
685 | return qos | val_mask; | ||
686 | } | ||
687 | |||
688 | static inline u16 mwl8k_qos_setbit_qlen(u16 qos, u8 len) | 680 | static inline u16 mwl8k_qos_setbit_qlen(u16 qos, u8 len) |
689 | { | 681 | { |
690 | u16 val_mask = 0xff; | 682 | u16 val_mask = 0xff; |
@@ -1474,9 +1466,6 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) | |||
1474 | else | 1466 | else |
1475 | qos = mwl8k_qos_setbit_ack(qos, | 1467 | qos = mwl8k_qos_setbit_ack(qos, |
1476 | MWL8K_TXD_ACK_POLICY_NORMAL); | 1468 | MWL8K_TXD_ACK_POLICY_NORMAL); |
1477 | |||
1478 | if (qos & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT) | ||
1479 | qos = mwl8k_qos_setbit_amsdu(qos); | ||
1480 | } | 1469 | } |
1481 | 1470 | ||
1482 | dma = pci_map_single(priv->pdev, skb->data, | 1471 | dma = pci_map_single(priv->pdev, skb->data, |