Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300711
b: refs/heads/master
c: 186b491
h: refs/heads/master
i:
  300709: bfce6a3
  300707: 1039bce
  300703: a199047
v: v3
  • Loading branch information
Stanislav Yakovlev authored and John W. Linville committed Apr 11, 2012
1 parent 34aa374 commit bf9dc0c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 56 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5314526b1743e8e8614293db7d86e480b4fe9824
refs/heads/master: 186b4917451f22dc9c2d128bdca2bc751ef76994
55 changes: 0 additions & 55 deletions trunk/drivers/net/wireless/ipw2x00/libipw.h
Original file line number Diff line number Diff line change
Expand Up @@ -584,61 +584,6 @@ struct libipw_tim_parameters {

/*******************************************************/

enum { /* libipw_basic_report.map */
LIBIPW_BASIC_MAP_BSS = (1 << 0),
LIBIPW_BASIC_MAP_OFDM = (1 << 1),
LIBIPW_BASIC_MAP_UNIDENTIFIED = (1 << 2),
LIBIPW_BASIC_MAP_RADAR = (1 << 3),
LIBIPW_BASIC_MAP_UNMEASURED = (1 << 4),
/* Bits 5-7 are reserved */

};
struct libipw_basic_report {
u8 channel;
__le64 start_time;
__le16 duration;
u8 map;
} __packed;

enum { /* libipw_measurement_request.mode */
/* Bit 0 is reserved */
LIBIPW_MEASUREMENT_ENABLE = (1 << 1),
LIBIPW_MEASUREMENT_REQUEST = (1 << 2),
LIBIPW_MEASUREMENT_REPORT = (1 << 3),
/* Bits 4-7 are reserved */
};

enum {
LIBIPW_REPORT_BASIC = 0, /* required */
LIBIPW_REPORT_CCA = 1, /* optional */
LIBIPW_REPORT_RPI = 2, /* optional */
/* 3-255 reserved */
};

struct libipw_measurement_params {
u8 channel;
__le64 start_time;
__le16 duration;
} __packed;

struct libipw_measurement_request {
struct libipw_info_element ie;
u8 token;
u8 mode;
u8 type;
struct libipw_measurement_params params[0];
} __packed;

struct libipw_measurement_report {
struct libipw_info_element ie;
u8 token;
u8 mode;
u8 type;
union {
struct libipw_basic_report basic[0];
} u;
} __packed;

struct libipw_tpc_report {
u8 transmit_power;
u8 link_margin;
Expand Down

0 comments on commit bf9dc0c

Please sign in to comment.