diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:25:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:41:59 -0400 |
| commit | 7eab0f64a9eba5405222fdef0ede2468bf495efd (patch) | |
| tree | ec99640b8d0b12adbfacb85c27683125debd14f2 /include/net/bluetooth/mgmt.h | |
| parent | cade455596504fae8e134a27189713ddf7c6d04d (diff) | |
| parent | 8065248069097dddf9945acfb2081025e9618c16 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
Diffstat (limited to 'include/net/bluetooth/mgmt.h')
| -rw-r--r-- | include/net/bluetooth/mgmt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index ffc1377e092e..ebfd91fc20f8 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h | |||
| @@ -117,7 +117,7 @@ struct mgmt_mode { | |||
| 117 | #define MGMT_OP_SET_DISCOVERABLE 0x0006 | 117 | #define MGMT_OP_SET_DISCOVERABLE 0x0006 |
| 118 | struct mgmt_cp_set_discoverable { | 118 | struct mgmt_cp_set_discoverable { |
| 119 | __u8 val; | 119 | __u8 val; |
| 120 | __u16 timeout; | 120 | __le16 timeout; |
| 121 | } __packed; | 121 | } __packed; |
| 122 | #define MGMT_SET_DISCOVERABLE_SIZE 3 | 122 | #define MGMT_SET_DISCOVERABLE_SIZE 3 |
| 123 | 123 | ||