← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/staging/ath6kl/wmi/wmi_host.h

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/ath6kl/wmi/wmi_host.h
31
31
#endif
32
32
 
33
33
struct wmi_stats {
34
 
    A_UINT32    cmd_len_err;
35
 
    A_UINT32    cmd_id_err;
 
34
    u32 cmd_len_err;
 
35
    u32 cmd_id_err;
36
36
};
37
37
 
38
38
#define SSID_IE_LEN_INDEX 13
42
42
#define SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS
43
43
#define SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS SIGNAL_QUALITY_THRESHOLD_LEVELS
44
44
typedef struct sq_threshold_params_s {
45
 
    A_INT16 upper_threshold[SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS];
46
 
    A_INT16 lower_threshold[SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS];
47
 
    A_UINT32 upper_threshold_valid_count;
48
 
    A_UINT32 lower_threshold_valid_count;
49
 
    A_UINT32 polling_interval;
50
 
    A_UINT8 weight;
51
 
    A_UINT8  last_rssi; //normally you would expect this to be bss specific but we keep only one instance because its only valid when the device is in a connected state. Not sure if it belongs to host or target.
52
 
    A_UINT8  last_rssi_poll_event; //Not sure if it belongs to host or target
 
45
    s16 upper_threshold[SIGNAL_QUALITY_UPPER_THRESHOLD_LEVELS];
 
46
    s16 lower_threshold[SIGNAL_QUALITY_LOWER_THRESHOLD_LEVELS];
 
47
    u32 upper_threshold_valid_count;
 
48
    u32 lower_threshold_valid_count;
 
49
    u32 polling_interval;
 
50
    u8 weight;
 
51
    u8 last_rssi; //normally you would expect this to be bss specific but we keep only one instance because its only valid when the device is in a connected state. Not sure if it belongs to host or target.
 
52
    u8 last_rssi_poll_event; //Not sure if it belongs to host or target
53
53
} SQ_THRESHOLD_PARAMS;
54
54
 
55
55
/*
60
60
#define A_NUM_BANDS            2
61
61
 
62
62
struct wmi_t {
63
 
    A_BOOL                          wmi_ready;
64
 
    A_BOOL                          wmi_numQoSStream;
65
 
    A_UINT16                        wmi_streamExistsForAC[WMM_NUM_AC];
66
 
    A_UINT8                         wmi_fatPipeExists;
 
63
    bool                          wmi_ready;
 
64
    bool                          wmi_numQoSStream;
 
65
    u16 wmi_streamExistsForAC[WMM_NUM_AC];
 
66
    u8 wmi_fatPipeExists;
67
67
    void                           *wmi_devt;
68
68
    struct wmi_stats                wmi_stats;
69
69
    struct ieee80211_node_table     wmi_scan_table;
70
 
    A_UINT8                         wmi_bssid[ATH_MAC_LEN];
71
 
    A_UINT8                         wmi_powerMode;
72
 
    A_UINT8                         wmi_phyMode;
73
 
    A_UINT8                         wmi_keepaliveInterval;
 
70
    u8 wmi_bssid[ATH_MAC_LEN];
 
71
    u8 wmi_powerMode;
 
72
    u8 wmi_phyMode;
 
73
    u8 wmi_keepaliveInterval;
74
74
#ifdef THREAD_X
75
75
    A_CSECT_T                       wmi_lock;
76
76
#else 
80
80
    SQ_THRESHOLD_PARAMS             wmi_SqThresholdParams[SIGNAL_QUALITY_METRICS_NUM_MAX];
81
81
    CRYPTO_TYPE                     wmi_pair_crypto_type;
82
82
    CRYPTO_TYPE                     wmi_grp_crypto_type;
83
 
    A_BOOL                          wmi_is_wmm_enabled;
84
 
    A_UINT8                         wmi_ht_allowed[A_NUM_BANDS];
85
 
    A_UINT8                         wmi_traffic_class;
 
83
    bool                          wmi_is_wmm_enabled;
 
84
    u8 wmi_ht_allowed[A_NUM_BANDS];
 
85
    u8 wmi_traffic_class;
86
86
};
87
87
 
88
88
#ifdef THREAD_X