diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-15 16:33:28 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-15 16:33:28 -0500 |
| commit | 1fcfe76a760e78d7774a254608557c84071b0cfb (patch) | |
| tree | 2659028625a15a6bcbef350d16ace21982f714d4 /net/bluetooth | |
| parent | 0c8173385e549f95cd80c3fff5aab87b4f881d8d (diff) | |
| parent | 56e6417b49132d4f56e9f2241d31942b90b46315 (diff) | |
| download | linux-stable-1fcfe76a760e78d7774a254608557c84071b0cfb.tar.gz linux-stable-1fcfe76a760e78d7774a254608557c84071b0cfb.tar.bz2 linux-stable-1fcfe76a760e78d7774a254608557c84071b0cfb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index c1e2bbafb549..ff8aaa736650 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -311,6 +311,7 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d) d->state = BT_OPEN; d->flags = 0; d->mscex = 0; + d->sec_level = BT_SECURITY_LOW; d->mtu = RFCOMM_DEFAULT_MTU; d->v24_sig = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV; |