diff options
| author | John W. Linville | 2012-09-14 13:53:49 -0400 |
|---|---|---|
| committer | John W. Linville | 2012-09-14 13:53:49 -0400 |
| commit | 9316f0e3c6ba524d8fa14bfded048b252891931a (patch) | |
| tree | 60326e5943997bb72aaf2a375f8a20c61ec7bbcd /include/net | |
| parent | 7f2e6a5d8608d0353b017a0fe15502307593734e (diff) | |
| parent | 7a5f799becc51c842ec1a3aeb8dd82651aea7036 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/smp.h | 2 | ||||
| -rw-r--r-- | include/net/cfg80211.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h index 50993a531d45..f8ba07f3e5fa 100644 --- a/include/net/bluetooth/smp.h +++ b/include/net/bluetooth/smp.h @@ -136,7 +136,7 @@ struct smp_chan { }; /* SMP Commands */ -int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level); +int smp_conn_security(struct hci_conn *hcon, __u8 sec_level); int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb); int smp_distribute_keys(struct l2cap_conn *conn, __u8 force); int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey); diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 7b3b0568d289..a9a2be78e73c 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -245,6 +245,7 @@ struct ieee80211_sta_vht_cap { * rates" IE, i.e. CCK rates first, then OFDM. * @n_bitrates: Number of bitrates in @bitrates * @ht_cap: HT capabilities in this band + * @vht_cap: VHT capabilities in this band */ struct ieee80211_supported_band { struct ieee80211_channel *channels; |