| 1 |
diff --git a/drivers/net/wireless/ath5k/attach.c b/drivers/net/wireless/ath5k/attach.c |
| 2 |
index 51d5698..49d82d7 100644 |
| 3 |
--- a/drivers/net/wireless/ath5k/attach.c |
| 4 |
+++ b/drivers/net/wireless/ath5k/attach.c |
| 5 |
@@ -317,9 +317,16 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) |
| 6 |
goto err_free; |
| 7 |
} |
| 8 |
|
| 9 |
+ /* Set MAC address */ |
| 10 |
+ ret = ath5k_eeprom_read_mac(ah, mac); |
| 11 |
+ if (ret) { |
| 12 |
+ ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n", |
| 13 |
+ sc->pdev->device); |
| 14 |
+ goto err_free; |
| 15 |
+ } |
| 16 |
+ |
| 17 |
- /* MAC address is cleared until add_interface */ |
| 18 |
ath5k_hw_set_lladdr(ah, mac); |
| 19 |
|
| 20 |
/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */ |
| 21 |
memset(ah->ah_bssid, 0xff, ETH_ALEN); |
| 22 |
ath5k_hw_set_associd(ah, ah->ah_bssid, 0); |
| 23 |
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c |
| 24 |
index 9eb9871..ec0104f 100644 |
| 25 |
--- a/drivers/net/wireless/ath5k/base.c |
| 26 |
+++ b/drivers/net/wireless/ath5k/base.c |
| 27 |
@@ -1182,7 +1182,9 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) |
| 28 |
bf->skbaddr = pci_map_single(sc->pdev, skb->data, skb->len, |
| 29 |
PCI_DMA_TODEVICE); |
| 30 |
|
| 31 |
- if (info->flags & IEEE80211_TX_CTL_NO_ACK) |
| 32 |
+ if ((info->flags & IEEE80211_TX_CTL_NO_ACK) && |
| 33 |
+ !((info->flags & IEEE80211_TX_CTL_INJECTED) && |
| 34 |
+ (ieee80211_has_morefrags(((struct ieee80211_hdr *)skb->data)->frame_control)))) |
| 35 |
flags |= AR5K_TXDESC_NOACK; |
| 36 |
|
| 37 |
pktlen = skb->len; |