summaryrefslogtreecommitdiff
path: root/package/b43/src/xmit.h
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-06-04 19:47:48 +0000
committerPeter Denison <openwrt@marshadder.org>2008-06-04 19:47:48 +0000
commitb2a1f5e79bd22acba7d88089904cfa78adc5b46f (patch)
treeaebbf69ea17a65b63b840390ead0e106ec2f5fc6 /package/b43/src/xmit.h
parente8620fa5aa1e1cc71f909f938c01207f22aa1b68 (diff)
downloadmtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.zip
mtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.tar.gz
mtk-20170518-b2a1f5e79bd22acba7d88089904cfa78adc5b46f.tar.bz2
Update b43 from compat-wireless-2008-05-26 codebase
SVN-Revision: 11358
Diffstat (limited to 'package/b43/src/xmit.h')
-rw-r--r--package/b43/src/xmit.h46
1 files changed, 16 insertions, 30 deletions
diff --git a/package/b43/src/xmit.h b/package/b43/src/xmit.h
index 4176503..0215faf 100644
--- a/package/b43/src/xmit.h
+++ b/package/b43/src/xmit.h
@@ -178,7 +178,7 @@ int b43_generate_txhdr(struct b43_wldev *dev,
u8 * txhdr,
const unsigned char *fragment_data,
unsigned int fragment_len,
- const struct ieee80211_tx_control *txctl, u16 cookie);
+ const struct ieee80211_tx_info *txctl, u16 cookie);
/* Transmit Status */
struct b43_txstatus {
@@ -207,25 +207,24 @@ enum {
B43_TXST_SUPP_ABNACK, /* Afterburner NACK */
};
-/* Transmit Status as received through DMA/PIO on old chips */
-struct b43_hwtxstatus {
- PAD_BYTES(4);
- __le16 cookie;
- u8 flags;
- u8 count;
- PAD_BYTES(2);
- __le16 seq;
- u8 phy_stat;
- PAD_BYTES(1);
-} __attribute__ ((__packed__));
-
/* Receive header for v4 firmware. */
struct b43_rxhdr_fw4 {
__le16 frame_len; /* Frame length */
PAD_BYTES(2);
__le16 phy_status0; /* PHY RX Status 0 */
- __u8 jssi; /* PHY RX Status 1: JSSI */
- __u8 sig_qual; /* PHY RX Status 1: Signal Quality */
+ union {
+ /* RSSI for A/B/G-PHYs */
+ struct {
+ __u8 jssi; /* PHY RX Status 1: JSSI */
+ __u8 sig_qual; /* PHY RX Status 1: Signal Quality */
+ } __attribute__ ((__packed__));
+
+ /* RSSI for N-PHYs */
+ struct {
+ __s8 power0; /* PHY RX Status 1: Power 0 */
+ __s8 power1; /* PHY RX Status 1: Power 1 */
+ } __attribute__ ((__packed__));
+ } __attribute__ ((__packed__));
__le16 phy_status2; /* PHY RX Status 2 */
__le16 phy_status3; /* PHY RX Status 3 */
__le32 mac_status; /* MAC RX status */
@@ -295,25 +294,12 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr);
void b43_handle_txstatus(struct b43_wldev *dev,
const struct b43_txstatus *status);
-
-void b43_handle_hwtxstatus(struct b43_wldev *dev,
- const struct b43_hwtxstatus *hw);
+bool b43_fill_txstatus_report(struct ieee80211_tx_info *report,
+ const struct b43_txstatus *status);
void b43_tx_suspend(struct b43_wldev *dev);
void b43_tx_resume(struct b43_wldev *dev);
-#define B43_NR_QOSPARMS 22
-enum {
- B43_QOSPARM_TXOP = 0,
- B43_QOSPARM_CWMIN,
- B43_QOSPARM_CWMAX,
- B43_QOSPARM_CWCUR,
- B43_QOSPARM_AIFS,
- B43_QOSPARM_BSLOTS,
- B43_QOSPARM_REGGAP,
- B43_QOSPARM_STATUS,
-};
-void b43_qos_init(struct b43_wldev *dev);
/* Helper functions for converting the key-table index from "firmware-format"
* to "raw-format" and back. The firmware API changed for this at some revision.