diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-09 20:23:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-09 20:23:52 -0700 |
| commit | c3eee1fb1d308564ada5f7ea57bc51efc6130b37 (patch) | |
| tree | 23fbf6e55aa23a1f4d92ba1441c885571faa7905 /net/batman-adv/hard-interface.h | |
| parent | s390/bpf: implement bpf_tail_call() helper (diff) | |
| parent | batman-adv: change the MAC of each VLAN upon ndo_set_mac_address (diff) | |
| download | linux-dev-c3eee1fb1d308564ada5f7ea57bc51efc6130b37.tar.xz linux-dev-c3eee1fb1d308564ada5f7ea57bc51efc6130b37.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- use common Jenkins hash instead of private implementation
- extend internal routing API
- properly re-arrange header files inclusion
- clarify precedence between '&' and '?'
- remove unused ethhdr variable in batadv_gw_dhcp_recipient_get()
- ensure per-VLAN structs are updated upon MAC change
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/hard-interface.h')
| -rw-r--r-- | net/batman-adv/hard-interface.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index e8b6ffea703d..5a31420513e1 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -18,6 +18,17 @@ #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ #define _NET_BATMAN_ADV_HARD_INTERFACE_H_ +#include "main.h" + +#include <linux/atomic.h> +#include <linux/compiler.h> +#include <linux/notifier.h> +#include <linux/rcupdate.h> +#include <linux/stddef.h> +#include <linux/types.h> + +struct net_device; + enum batadv_hard_if_state { BATADV_IF_NOT_IN_USE, BATADV_IF_TO_BE_REMOVED, |