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/soft-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 | 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/soft-interface.h')
| -rw-r--r-- | net/batman-adv/soft-interface.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 9ce08049ffd0..578e8a663c30 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,6 +18,17 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ +#include "main.h" + +#include <net/rtnetlink.h> + +struct batadv_hard_iface; +struct batadv_orig_node; +struct batadv_priv; +struct batadv_softif_vlan; +struct net_device; +struct sk_buff; + int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, |