diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
| commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
| tree | 552841f13496306f0140d5faca82ae9987a81b5e /net/bluetooth/bnep/bnep.h | |
| parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
| download | linux-f1e0477a7b7a541f51eea279910eed4ddd010033.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
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; |