tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem

John W. Linville 82362ccb 118133e6

+41 -10
+12
drivers/bluetooth/btmrvl_debugfs.c
··· 64 64 return -EFAULT; 65 65 66 66 ret = strict_strtol(buf, 10, &result); 67 + if (ret) 68 + return ret; 67 69 68 70 priv->btmrvl_dev.hscfgcmd = result; 69 71 ··· 110 108 return -EFAULT; 111 109 112 110 ret = strict_strtol(buf, 10, &result); 111 + if (ret) 112 + return ret; 113 113 114 114 priv->btmrvl_dev.psmode = result; 115 115 ··· 151 147 return -EFAULT; 152 148 153 149 ret = strict_strtol(buf, 10, &result); 150 + if (ret) 151 + return ret; 154 152 155 153 priv->btmrvl_dev.pscmd = result; 156 154 ··· 197 191 return -EFAULT; 198 192 199 193 ret = strict_strtol(buf, 16, &result); 194 + if (ret) 195 + return ret; 200 196 201 197 priv->btmrvl_dev.gpio_gap = result; 202 198 ··· 238 230 return -EFAULT; 239 231 240 232 ret = strict_strtol(buf, 10, &result); 233 + if (ret) 234 + return ret; 241 235 242 236 priv->btmrvl_dev.hscmd = result; 243 237 if (priv->btmrvl_dev.hscmd) { ··· 282 272 return -EFAULT; 283 273 284 274 ret = strict_strtol(buf, 10, &result); 275 + if (ret) 276 + return ret; 285 277 286 278 priv->btmrvl_dev.hsmode = result; 287 279
+2
drivers/net/wireless/mwifiex/cfg80211.c
··· 1288 1288 1289 1289 *(unsigned long *) wdev_priv = (unsigned long) priv; 1290 1290 1291 + set_wiphy_dev(wdev->wiphy, (struct device *) priv->adapter->dev); 1292 + 1291 1293 ret = wiphy_register(wdev->wiphy); 1292 1294 if (ret < 0) { 1293 1295 dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",
+3 -1
drivers/net/wireless/mwl8k.c
··· 2474 2474 * faster client. 2475 2475 */ 2476 2476 #define MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY 0x00000400 2477 + #define MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR 0x00000200 2477 2478 #define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT 0x00000080 2478 2479 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP 0x00000020 2479 2480 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON 0x00000010 ··· 2511 2510 cmd->flags = cpu_to_le32(MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT | 2512 2511 MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP | 2513 2512 MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON | 2514 - MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY); 2513 + MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY | 2514 + MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR); 2515 2515 cmd->num_tx_desc_per_queue = cpu_to_le32(MWL8K_TX_DESCS); 2516 2516 cmd->total_rxd = cpu_to_le32(MWL8K_RX_DESCS); 2517 2517
+10 -8
net/bluetooth/hci_event.c
··· 477 477 * command otherwise */ 478 478 u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 }; 479 479 480 - /* Events for 1.2 and newer controllers */ 481 - if (hdev->lmp_ver > 1) { 482 - events[4] |= 0x01; /* Flow Specification Complete */ 483 - events[4] |= 0x02; /* Inquiry Result with RSSI */ 484 - events[4] |= 0x04; /* Read Remote Extended Features Complete */ 485 - events[5] |= 0x08; /* Synchronous Connection Complete */ 486 - events[5] |= 0x10; /* Synchronous Connection Changed */ 487 - } 480 + /* CSR 1.1 dongles does not accept any bitfield so don't try to set 481 + * any event mask for pre 1.2 devices */ 482 + if (hdev->lmp_ver <= 1) 483 + return; 484 + 485 + events[4] |= 0x01; /* Flow Specification Complete */ 486 + events[4] |= 0x02; /* Inquiry Result with RSSI */ 487 + events[4] |= 0x04; /* Read Remote Extended Features Complete */ 488 + events[5] |= 0x08; /* Synchronous Connection Complete */ 489 + events[5] |= 0x10; /* Synchronous Connection Changed */ 488 490 489 491 if (hdev->features[3] & LMP_RSSI_INQ) 490 492 events[4] |= 0x04; /* Inquiry Result with RSSI */
+1
net/bluetooth/l2cap_sock.c
··· 413 413 break; 414 414 } 415 415 416 + memset(&cinfo, 0, sizeof(cinfo)); 416 417 cinfo.hci_handle = chan->conn->hcon->handle; 417 418 memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3); 418 419
+1
net/bluetooth/rfcomm/sock.c
··· 788 788 789 789 l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; 790 790 791 + memset(&cinfo, 0, sizeof(cinfo)); 791 792 cinfo.hci_handle = conn->hcon->handle; 792 793 memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); 793 794
+12 -1
net/bluetooth/sco.c
··· 369 369 370 370 case BT_CONNECTED: 371 371 case BT_CONFIG: 372 + if (sco_pi(sk)->conn) { 373 + sk->sk_state = BT_DISCONN; 374 + sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); 375 + hci_conn_put(sco_pi(sk)->conn->hcon); 376 + sco_pi(sk)->conn->hcon = NULL; 377 + } else 378 + sco_chan_del(sk, ECONNRESET); 379 + break; 380 + 372 381 case BT_CONNECT: 373 382 case BT_DISCONN: 374 383 sco_chan_del(sk, ECONNRESET); ··· 828 819 conn->sk = NULL; 829 820 sco_pi(sk)->conn = NULL; 830 821 sco_conn_unlock(conn); 831 - hci_conn_put(conn->hcon); 822 + 823 + if (conn->hcon) 824 + hci_conn_put(conn->hcon); 832 825 } 833 826 834 827 sk->sk_state = BT_CLOSED;