diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-07 00:37:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-07 00:37:13 -0800 |
| commit | b8cec4a415e807a2f8679efa89558a040a7003de (patch) | |
| tree | 1a5fc7c31c4f8b55ea850599bb7309871165f48e /net/batman-adv/soft-interface.h | |
| parent | 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 (diff) | |
| parent | e44d8fe2b5c27ecc230f886d4cc49fcbd86f87a0 (diff) | |
| download | linux-b8cec4a415e807a2f8679efa89558a040a7003de.tar.gz linux-b8cec4a415e807a2f8679efa89558a040a7003de.tar.bz2 linux-b8cec4a415e807a2f8679efa89558a040a7003de.zip | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/soft-interface.h')
| -rw-r--r-- | net/batman-adv/soft-interface.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index e7b0e1a34a55..4789b6f2a0b3 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -27,9 +27,10 @@ int softif_neigh_seq_print_text(struct seq_file *seq, void *offset); void softif_neigh_purge(struct bat_priv *bat_priv); int interface_tx(struct sk_buff *skb, struct net_device *soft_iface); void interface_rx(struct net_device *soft_iface, - struct sk_buff *skb, struct batman_if *recv_if, + struct sk_buff *skb, struct hard_iface *recv_if, int hdr_size); struct net_device *softif_create(char *name); void softif_destroy(struct net_device *soft_iface); +int softif_is_valid(struct net_device *net_dev); #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ |