diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:36 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:36 +0200 |
commit | bb14f8e91a4d2bdb8643f6f166299ada8d015377 (patch) | |
tree | f212dc9be4f26684bd06bfd138444282b457949a /net/bluetooth/bnep/bnep.h | |
parent | 180bbb1528515d262ae4bcb7244379b8dcfc9674 (diff) | |
parent | 025ddfad021effc8ea256d8aa09ddf3b1b8972e6 (diff) |
Merge topic branch 'other' into integration-linux-ux500-3.3
Diffstat (limited to 'net/bluetooth/bnep/bnep.h')
-rw-r--r-- | net/bluetooth/bnep/bnep.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h index e7ee5314f39..0545fe0493f 100644 --- a/net/bluetooth/bnep/bnep.h +++ b/net/bluetooth/bnep/bnep.h @@ -166,6 +166,8 @@ struct bnep_session { struct socket *sock; struct net_device *dev; + + unsigned int setup_done; }; void bnep_net_setup(struct net_device *dev); |