From 8516f2e5c2c4b1cf034a381df27e93d8c43f128b Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Wed, 16 Jun 2010 19:12:22 +0900 Subject: [PATCH] --- yaml --- r: 203090 b: refs/heads/master c: 2237e928840c9a1d8bc5143daf28c419d9ca0bda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/desc.c | 2 +- trunk/drivers/net/wireless/ath/ath5k/desc.h | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c78f9454dd6b..4e45a4078f25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03417bc605ef03cd851f13e36581cf2e1304755d +refs/heads/master: 2237e928840c9a1d8bc5143daf28c419d9ca0bda diff --git a/trunk/drivers/net/wireless/ath/ath5k/desc.c b/trunk/drivers/net/wireless/ath/ath5k/desc.c index 41a490e4968e..f1f1a22ce475 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/desc.c +++ b/trunk/drivers/net/wireless/ath/ath5k/desc.c @@ -110,7 +110,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, case AR5K_PKT_TYPE_PIFS: frame_type = AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS; default: - frame_type = type /*<< 2 ?*/; + frame_type = type; } tx_ctl->tx_control_0 |= diff --git a/trunk/drivers/net/wireless/ath/ath5k/desc.h b/trunk/drivers/net/wireless/ath/ath5k/desc.h index 50f9a12b5acd..1aca4af2f79f 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/desc.h +++ b/trunk/drivers/net/wireless/ath/ath5k/desc.h @@ -169,11 +169,13 @@ struct ath5k_hw_2w_tx_ctl { #define AR5K_2W_TX_DESC_CTL1_RTS_DURATION_5210 0xfff80000 /* [5210] lower 13 bit of duration */ /* Frame types */ -#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL 0x00 -#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM 0x04 -#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL 0x08 -#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 0x0c -#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS 0x10 +#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NORMAL 0 +#define AR5K_AR5210_TX_DESC_FRAME_TYPE_ATIM 1 +#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PSPOLL 2 +#define AR5K_AR5210_TX_DESC_FRAME_TYPE_NO_DELAY 3 +#define AR5K_AR5211_TX_DESC_FRAME_TYPE_BEACON 3 +#define AR5K_AR5210_TX_DESC_FRAME_TYPE_PIFS 4 +#define AR5K_AR5211_TX_DESC_FRAME_TYPE_PRESP 4 /* * 5212 hardware 4-word TX control descriptor