diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:30:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:30:25 +0200 |
| commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
| tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /net/bluetooth/bnep/bnep.h | |
| parent | Merge branches 'imx/pata' and 'imx/sata' into next/driver (diff) | |
| parent | hw_random: add driver for atmel true hardware random number generator (diff) | |
| download | linux-995a0605a6665858d73f9e80053414909be33f27.tar.xz linux-995a0605a6665858d73f9e80053414909be33f27.zip | |
Merge branch 'at91/trng' into next/driver
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; |