diff options
author | Tilman Schmidt <tilman@imap.cc> | 2010-06-21 09:54:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-26 00:16:59 -0400 |
commit | 278a582989ade4cb5335762d6c5999562018859d (patch) | |
tree | b1de4dc1dc0fb9e96f2c9bd46516cbf0c9861d80 /drivers/isdn | |
parent | e7752ee280608a24e27f163641121bdc2c68d6af (diff) |
isdn/gigaset: correct CAPI voice connection encoding
Make the Gigaset CAPI driver select L2_VOICE (AT^SBPR=2) as the
layer 2 encoding for transparent connections, like the ISDN4Linux
variant. L2_BITSYNC (AT^SBPR=0) mutes internal connections and
distorts external ones.
Impact: bugfix
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/gigaset/capi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 245a6083f79d..cb55ead557cc 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
@@ -1327,13 +1327,13 @@ static void do_connect_req(struct gigaset_capi_ctr *iif, | |||
1327 | bcs->proto2 = L2_HDLC; | 1327 | bcs->proto2 = L2_HDLC; |
1328 | break; | 1328 | break; |
1329 | case 1: | 1329 | case 1: |
1330 | bcs->proto2 = L2_BITSYNC; | 1330 | bcs->proto2 = L2_VOICE; |
1331 | break; | 1331 | break; |
1332 | default: | 1332 | default: |
1333 | dev_warn(cs->dev, | 1333 | dev_warn(cs->dev, |
1334 | "B1 Protocol %u unsupported, using Transparent\n", | 1334 | "B1 Protocol %u unsupported, using Transparent\n", |
1335 | cmsg->B1protocol); | 1335 | cmsg->B1protocol); |
1336 | bcs->proto2 = L2_BITSYNC; | 1336 | bcs->proto2 = L2_VOICE; |
1337 | } | 1337 | } |
1338 | if (cmsg->B2protocol != 1) | 1338 | if (cmsg->B2protocol != 1) |
1339 | dev_warn(cs->dev, | 1339 | dev_warn(cs->dev, |
@@ -1456,13 +1456,13 @@ static void do_connect_resp(struct gigaset_capi_ctr *iif, | |||
1456 | bcs->proto2 = L2_HDLC; | 1456 | bcs->proto2 = L2_HDLC; |
1457 | break; | 1457 | break; |
1458 | case 1: | 1458 | case 1: |
1459 | bcs->proto2 = L2_BITSYNC; | 1459 | bcs->proto2 = L2_VOICE; |
1460 | break; | 1460 | break; |
1461 | default: | 1461 | default: |
1462 | dev_warn(cs->dev, | 1462 | dev_warn(cs->dev, |
1463 | "B1 Protocol %u unsupported, using Transparent\n", | 1463 | "B1 Protocol %u unsupported, using Transparent\n", |
1464 | cmsg->B1protocol); | 1464 | cmsg->B1protocol); |
1465 | bcs->proto2 = L2_BITSYNC; | 1465 | bcs->proto2 = L2_VOICE; |
1466 | } | 1466 | } |
1467 | if (cmsg->B2protocol != 1) | 1467 | if (cmsg->B2protocol != 1) |
1468 | dev_warn(cs->dev, | 1468 | dev_warn(cs->dev, |