aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp/capi.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/cmtp/capi.c')
-rw-r--r--net/bluetooth/cmtp/capi.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index 1ca8a87a0787..75bd2c42e3e7 100644
--- 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
253 if (skb->len < CAPI_MSG_BASELEN + 15) 253 if (skb->len < CAPI_MSG_BASELEN + 15)
254 break; 254 break;
255 255
256 controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 10);
257
258 if (!info && ctrl) { 256 if (!info && ctrl) {
259 int len = min_t(uint, CAPI_MANUFACTURER_LEN, 257 int len = min_t(uint, CAPI_MANUFACTURER_LEN,
260 skb->data[CAPI_MSG_BASELEN + 14]); 258 skb->data[CAPI_MSG_BASELEN + 14]);
@@ -270,8 +268,6 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
270 if (skb->len < CAPI_MSG_BASELEN + 32) 268 if (skb->len < CAPI_MSG_BASELEN + 32)
271 break; 269 break;
272 270
273 controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);
274
275 if (!info && ctrl) { 271 if (!info && ctrl) {
276 ctrl->version.majorversion = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 16); 272 ctrl->version.majorversion = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 16);
277 ctrl->version.minorversion = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 20); 273 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
285 if (skb->len < CAPI_MSG_BASELEN + 17) 281 if (skb->len < CAPI_MSG_BASELEN + 17)
286 break; 282 break;
287 283
288 controller = CAPIMSG_U32(skb->data, CAPI_MSG_BASELEN + 12);
289
290 if (!info && ctrl) { 284 if (!info && ctrl) {
291 int len = min_t(uint, CAPI_SERIAL_LEN, 285 int len = min_t(uint, CAPI_SERIAL_LEN,
292 skb->data[CAPI_MSG_BASELEN + 16]); 286 skb->data[CAPI_MSG_BASELEN + 16]);