diff options
| author | David S. Miller | 2015-06-10 05:23:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-06-10 05:23:52 +0200 |
| commit | c3eee1fb1d308564ada5f7ea57bc51efc6130b37 (patch) | |
| tree | 23fbf6e55aa23a1f4d92ba1441c885571faa7905 /net/batman-adv/distributed-arp-table.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 | kernel-qcow2-linux-c3eee1fb1d308564ada5f7ea57bc51efc6130b37.tar.gz kernel-qcow2-linux-c3eee1fb1d308564ada5f7ea57bc51efc6130b37.tar.xz kernel-qcow2-linux-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/distributed-arp-table.h')
| -rw-r--r-- | net/batman-adv/distributed-arp-table.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index ed41b8edba18..3181507ebc14 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -18,12 +18,19 @@ #ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ #define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ -#ifdef CONFIG_BATMAN_ADV_DAT +#include "main.h" + +#include <linux/compiler.h> +#include <linux/netdevice.h> +#include <linux/types.h> -#include "types.h" #include "originator.h" +#include "packet.h" -#include <linux/if_arp.h> +struct seq_file; +struct sk_buff; + +#ifdef CONFIG_BATMAN_ADV_DAT /* BATADV_DAT_ADDR_MAX - maximum address value in the DHT space */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0) |