diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
commit | 20c81608dcd30fc3817d6d430fca83f52b9aa965 (patch) | |
tree | 1089db91ce174f5768dadd210ba3096ad027c8a6 /net/bluetooth/bnep/bnep.h | |
parent | 78b63e0cee40de1adbe69ceee752ae3b6a6d36e2 (diff) | |
parent | 961f14635e3589d262af5dcdc596cbb5bc24aea7 (diff) |
Merge topic branch 'other' into integration-linux-ux500
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); |