diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /drivers/staging/batman-adv/types.h | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
| download | op-kernel-dev-73e6d6c6467771838c1fc6949e6768a12ed72464.zip op-kernel-dev-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.gz | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/staging/batman-adv/types.h')
| -rw-r--r-- | drivers/staging/batman-adv/types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h index 21d0717..9aa9d36 100644 --- a/drivers/staging/batman-adv/types.h +++ b/drivers/staging/batman-adv/types.h @@ -126,6 +126,7 @@ struct socket_client { unsigned char index; spinlock_t lock; wait_queue_head_t queue_wait; + struct bat_priv *bat_priv; }; struct socket_packet { |
