Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless...

[linux-2.6-block.git] / net / bluetooth / cmtp / capi.c

diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index 1ca8a87a078776d75d223a204aa4f42770c229a3..75bd2c42e3e791024abf9d4014fbc41d12dea0da 100644 (file)
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -253,8 +253,6 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
                        if (skb->len < CAPI_MSG_BASELEN + 15)
                                break;
 
-                       controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 10);
-
                        if (!info && ctrl) {
                                int len = min_t(uint, CAPI_MANUFACTURER_LEN,
                                                skb->data[CAPI_MSG_BASELEN + 14]);
@@ -270,8 +268,6 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
                        if (skb->len < CAPI_MSG_BASELEN + 32)
                                break;
 
-                       controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);
-
                        if (!info && ctrl) {
                                ctrl->version.majorversion = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 16);
                                ctrl->version.minorversion = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 20);
@@ -285,8 +281,6 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
                        if (skb->len < CAPI_MSG_BASELEN + 17)
                                break;
 
-                       controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);
-
                        if (!info && ctrl) {
                                int len = min_t(uint, CAPI_SERIAL_LEN,
                                                skb->data[CAPI_MSG_BASELEN + 16]);