aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath9k/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath9k/main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 2b3b11bb564b..55f48685b5ea 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1099,7 +1099,7 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
1099 ath_node_put(sc, an, ATH9K_BH_STATUS_CHANGE); 1099 ath_node_put(sc, an, ATH9K_BH_STATUS_CHANGE);
1100} 1100}
1101 1101
1102int ath__rx_indicate(struct ath_softc *sc, 1102int _ath_rx_indicate(struct ath_softc *sc,
1103 struct sk_buff *skb, 1103 struct sk_buff *skb,
1104 struct ath_recv_status *status, 1104 struct ath_recv_status *status,
1105 u16 keyix) 1105 u16 keyix)
@@ -1119,9 +1119,6 @@ int ath__rx_indicate(struct ath_softc *sc,
1119 skb_pull(skb, padsize); 1119 skb_pull(skb, padsize);
1120 } 1120 }
1121 1121
1122 /* remove FCS before passing up to protocol stack */
1123 skb_trim(skb, (skb->len - FCS_LEN));
1124
1125 /* Prepare rx status */ 1122 /* Prepare rx status */
1126 ath9k_rx_prepare(sc, skb, status, &rx_status); 1123 ath9k_rx_prepare(sc, skb, status, &rx_status);
1127 1124
@@ -1364,7 +1361,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1364 goto bad2; 1361 goto bad2;
1365 } 1362 }
1366 1363
1367 hw->flags = IEEE80211_HW_SIGNAL_DBM | 1364 hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
1365 IEEE80211_HW_SIGNAL_DBM |
1368 IEEE80211_HW_NOISE_DBM; 1366 IEEE80211_HW_NOISE_DBM;
1369 1367
1370 SET_IEEE80211_DEV(hw, &pdev->dev); 1368 SET_IEEE80211_DEV(hw, &pdev->dev);