| Message ID | 1487150713-3510-2-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 96609f366c6f792421e1939c5c834abbe24eb88a |
| Delegated to: | Kalle Valo |
| Headers | show |
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > From: Gabor Juhos <juhosg@openwrt.org> > > The rt2800_drv_data structure contains driver specific > information. Move the declaration into the rt2800lib.h > header which is a more logical place for it. Also fix > the comment style to avoid checkpatch warning. > > The patch contains no functional changes, it is in > preparation for the next patch. > > Signed-off-by: Gabor Juhos <juhosg@openwrt.org> > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> 10 patches applied to wireless-drivers-next.git, thanks. 96609f366c6f rt2x00: rt2800lib: move rt2800_drv_data declaration into rt2800lib.h a13d985f26f6 rt2800: identify station based on status WCID 5edb05afebba rt2x00: separte filling tx status from rt2x00lib_txdone 56646adf9cd6 rt2x00: separte clearing entry from rt2x00lib_txdone a09305d05216 rt2x00: add txdone nomatch function ec80ad70d778 rt2x00: fixup fill_tx_status for nomatch case 293dff78ee05 rt2x00: use txdone_nomatch on rt2800usb 9d7a7a4d2b02 rt2800: status based rate flags for nomatch case fb47ada8dc3c rt2800: use TXOP_BACKOFF for probe frames dd35cc0896fa rt2x00: fix rt2x00debug_dump_frame comment
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h index 256496b..0e7051d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -2987,29 +2987,4 @@ enum rt2800_eeprom_word { */ #define BCN_TBTT_OFFSET 64 -/* - * Hardware has 255 WCID table entries. First 32 entries are reserved for - * shared keys. Since parts of the pairwise key table might be shared with - * the beacon frame buffers 6 & 7 we could only use the first 222 entries. - */ -#define WCID_START 33 -#define WCID_END 222 -#define STA_IDS_SIZE (WCID_END - WCID_START + 2) - -/* - * RT2800 driver data structure - */ -struct rt2800_drv_data { - u8 calibration_bw20; - u8 calibration_bw40; - u8 bbp25; - u8 bbp26; - u8 txmixer_gain_24g; - u8 txmixer_gain_5g; - u8 max_psdu; - unsigned int tbtt_tick; - unsigned int ampdu_factor_cnt[4]; - DECLARE_BITMAP(sta_ids, STA_IDS_SIZE); -}; - #endif /* RT2800_H */ diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h index 0a8b4df..8e1ae13 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h @@ -20,6 +20,29 @@ #ifndef RT2800LIB_H #define RT2800LIB_H +/* + * Hardware has 255 WCID table entries. First 32 entries are reserved for + * shared keys. Since parts of the pairwise key table might be shared with + * the beacon frame buffers 6 & 7 we could only use the first 222 entries. + */ +#define WCID_START 33 +#define WCID_END 222 +#define STA_IDS_SIZE (WCID_END - WCID_START + 2) + +/* RT2800 driver data structure */ +struct rt2800_drv_data { + u8 calibration_bw20; + u8 calibration_bw40; + u8 bbp25; + u8 bbp26; + u8 txmixer_gain_24g; + u8 txmixer_gain_5g; + u8 max_psdu; + unsigned int tbtt_tick; + unsigned int ampdu_factor_cnt[4]; + DECLARE_BITMAP(sta_ids, STA_IDS_SIZE); +}; + struct rt2800_ops { void (*register_read)(struct rt2x00_dev *rt2x00dev, const unsigned int offset, u32 *value);