diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 03:56:13 +0100 |
| commit | 795ad0819be4d5922b5140bdda6ff9d0368b0512 (patch) | |
| tree | e96992a37b3ebc611b7de7a745f28237ecf7a365 /net/bluetooth/cmtp | |
| parent | 549367162dfdc75d573f74f4e2891f2dba41582f (diff) | |
| download | kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.zip kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.gz kernel_samsung_smdk4412-795ad0819be4d5922b5140bdda6ff9d0368b0512.tar.bz2 | |
first merge of networking with upstream
Diffstat (limited to 'net/bluetooth/cmtp')
| -rw-r--r-- | net/bluetooth/cmtp/capi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c index 040f67b..744233c 100644 --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c @@ -326,7 +326,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb) { struct capi_ctr *ctrl = &session->ctrl; struct cmtp_application *application; - __u16 appl; + __u16 cmd, appl; __u32 contr; BT_DBG("session %p skb %p len %d", session, skb, skb->len); @@ -344,6 +344,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb) return; } + cmd = CAPICMD(CAPIMSG_COMMAND(skb->data), CAPIMSG_SUBCOMMAND(skb->data)); appl = CAPIMSG_APPID(skb->data); contr = CAPIMSG_CONTROL(skb->data); |