diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-19 14:37:26 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-19 14:37:26 +0200 |
| commit | 02dacdc326c29386bbae2574212ff029974444e7 (patch) | |
| tree | 048fa36d543d26bb7707cf99b6baa02ab5151acd /audio | |
| parent | c560d02ccf1dd156f068b1da8a3e7d75d2319dfd (diff) | |
Don't use L2CAP_LM_SECURE and RFCOMM_LM_SECURE for now
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/avdtp.c | 4 | ||||
| -rw-r--r-- | audio/control.c | 4 | ||||
| -rw-r--r-- | audio/manager.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c index c215ca24..c3286bfc 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -2773,9 +2773,7 @@ drop: static GIOChannel *avdtp_server_socket(gboolean master) { - int lm; - - lm = L2CAP_LM_SECURE; + int lm = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT; if (master) lm |= L2CAP_LM_MASTER; diff --git a/audio/control.c b/audio/control.c index 82646061..a1014d48 100644 --- a/audio/control.c +++ b/audio/control.c @@ -705,10 +705,8 @@ drop: static GIOChannel *avctp_server_socket(gboolean master) { - int lm; GIOChannel *io; - - lm = L2CAP_LM_SECURE; + int lm = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT; if (master) lm |= L2CAP_LM_MASTER; diff --git a/audio/manager.c b/audio/manager.c index 5a363f9c..ef8056de 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -565,7 +565,7 @@ static int headset_server_init(struct audio_adapter *adapter) hfp = tmp; } - flags = RFCOMM_LM_SECURE; + flags = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT; if (master) flags |= RFCOMM_LM_MASTER; @@ -641,7 +641,7 @@ static int gateway_server_init(struct audio_adapter *adapter) master = tmp; } - flags = RFCOMM_LM_SECURE; + flags = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT; if (master) flags |= RFCOMM_LM_MASTER; |