diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-08-26 18:33:51 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-26 18:33:51 +0400 |
commit | e2e6be56df37c371f564e127c154036b0c2211a1 (patch) | |
tree | 6687fc0340c20a76972bcaf5c665364c1074aee8 /net/bluetooth/bnep/bnep.h | |
parent | bc909d9ddbf7778371e36a651d6e4194b1cc7d4c (diff) | |
parent | 8b2a3827bb12430d932cd479b22d906baf08c212 (diff) | |
download | linux-e2e6be56df37c371f564e127c154036b0c2211a1.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/bnep/bnep.h')
-rw-r--r-- | net/bluetooth/bnep/bnep.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h index 8e6c06158f8e..e7ee5314f39a 100644 --- a/net/bluetooth/bnep/bnep.h +++ b/net/bluetooth/bnep/bnep.h @@ -155,6 +155,7 @@ struct bnep_session { unsigned int role; unsigned long state; unsigned long flags; + atomic_t terminate; struct task_struct *task; struct ethhdr eh; |