| Message ID | 20170116025444.GA32156@makrotopia.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Daniel Golle <daniel@makrotopia.org> 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> I didn't quite get what patches (if any) I should take, so I'm dropping the ones below. Please resend the patches which are ok as a new pathchset. 9 patches set to Changes Requested. 9517997 [v2,01/14] rt2x00: rt2800lib: move rt2800_drv_data declaration into rt2800lib.h 9518001 [v2,02/14] rt2x00: rt2800lib: introduce RT2800_HAS_HIGH_SHARED_MEM flag 9518003 [v2,03/14] rt2x00: rt2800: serialize shared memory access 9518005 [v2,04/14] rt2x00: rt2800lib: fix beacon generation on RT3593 9518007 [v2,05/14] rt2x00: rt2800lib: add hw_beacon_count field to struct rt2800_drv_data 9518009 [v2,06/14] rt2x00: rt2800lib: init additional beacon offset registers 9518011 [v2,07/14] rt2x00: rt2800lib: fix max supported beacon count for RT3593 9518013 [v2,08/14] rt2x00: rt2800mmio: add a workaround for spurious TX_FIFO_STATUS interrupts 9518015 [v2,09/14] rt2x00: rt2x00pci: set PCI MWI only if supported
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h index ec622a08a486..2371896c1e99 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -2969,20 +2969,4 @@ enum rt2800_eeprom_word { #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 0a8b4df665fe..256928f0ea6a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h @@ -20,6 +20,22 @@ #ifndef RT2800LIB_H #define RT2800LIB_H +#include "rt2800.h" + +/* 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);