diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-25 16:20:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-25 16:20:38 -0700 |
| commit | b8766e4ed3e9fc6b27dc3ead029cd307caa926d2 (patch) | |
| tree | 5d115c3fcaec9ddb3d47663e621e138dc3fcbc99 /net/batman-adv/multicast.h | |
| parent | dafc21995db9b2ef61a2d613f872a5c565731548 (diff) | |
| parent | 854d2a63de86a769db4dbed75b660f544b3c0c7a (diff) | |
| download | linux-b8766e4ed3e9fc6b27dc3ead029cd307caa926d2.tar.bz2 | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- code restyling and beautification
- use int kernel types instead of C99
- update kereldoc
- prevent potential hlist double deletion of VLAN objects
- fix gw bandwidth calculation
- convert list to hlist when needed
- add lockdep_asserts calls in function with lock requirements
described in kerneldoc
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/multicast.h')
| -rw-r--r-- | net/batman-adv/multicast.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index beb6e56c624a..8f3cb04b9f13 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -20,8 +20,6 @@ #include "main.h" -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; /** |