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/gateway_common.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/gateway_common.h')
| -rw-r--r-- | net/batman-adv/gateway_common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index df5434229675..bd5c812cebf4 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -18,6 +18,13 @@ #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_ #define _NET_BATMAN_ADV_GATEWAY_COMMON_H_ +#include "main.h" + +#include <linux/types.h> + +struct batadv_priv; +struct net_device; + enum batadv_gw_modes { BATADV_GW_MODE_OFF, BATADV_GW_MODE_CLIENT, |