kernel: backport ssb changes from 4.4-rc1
[openwrt/staging/yousong.git] / package / kernel / mac80211 / patches / 600-0001-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch
1 From 7a69da907de668fb22a30ae218062d6f081864ea Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Sat, 17 Aug 2013 19:31:41 +0200
4 Subject: [PATCH] rt2x00: rt2800lib: move rt2800_drv_data declaration into
5 rt2800lib.h
6
7 The rt2800_drv_data structure contains driver specific
8 information. Move the declaration into the rt2800lib.h
9 header which is a more logical place for it. Also fix
10 the comment style to avoid checkpatch warning.
11
12 The patch contains no functional changes, it is in
13 preparation for the next patch.
14
15 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
16 ---
17 Changes since v1: ---
18 ---
19 drivers/net/wireless/rt2x00/rt2800.h | 13 -------------
20 drivers/net/wireless/rt2x00/rt2800lib.h | 11 +++++++++++
21 2 files changed, 11 insertions(+), 13 deletions(-)
22
23 --- a/drivers/net/wireless/rt2x00/rt2800lib.h
24 +++ b/drivers/net/wireless/rt2x00/rt2800lib.h
25 @@ -20,6 +20,20 @@
26 #ifndef RT2800LIB_H
27 #define RT2800LIB_H
28
29 +#include "rt2800.h"
30 +
31 +/* RT2800 driver data structure */
32 +struct rt2800_drv_data {
33 + u8 calibration_bw20;
34 + u8 calibration_bw40;
35 + u8 bbp25;
36 + u8 bbp26;
37 + u8 txmixer_gain_24g;
38 + u8 txmixer_gain_5g;
39 + unsigned int tbtt_tick;
40 + DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
41 +};
42 +
43 struct rt2800_ops {
44 void (*register_read)(struct rt2x00_dev *rt2x00dev,
45 const unsigned int offset, u32 *value);
46 --- a/drivers/net/wireless/rt2x00/rt2800.h
47 +++ b/drivers/net/wireless/rt2x00/rt2800.h
48 @@ -2969,18 +2969,4 @@ enum rt2800_eeprom_word {
49 #define WCID_END 222
50 #define STA_IDS_SIZE (WCID_END - WCID_START + 2)
51
52 -/*
53 - * RT2800 driver data structure
54 - */
55 -struct rt2800_drv_data {
56 - u8 calibration_bw20;
57 - u8 calibration_bw40;
58 - u8 bbp25;
59 - u8 bbp26;
60 - u8 txmixer_gain_24g;
61 - u8 txmixer_gain_5g;
62 - unsigned int tbtt_tick;
63 - DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
64 -};
65 -
66 #endif /* RT2800_H */