diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-20 12:59:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 12:59:37 -0700 |
| commit | eac56465b88cc9ad3b964a9f0a02be3d3a136ddf (patch) | |
| tree | 63550c9f343f6c9351f0b54be8664807e97abb93 /net/batman-adv/soft-interface.h | |
| parent | 1b9c4134c126aa8ae00a57672d4a4eaecc436b54 (diff) | |
| parent | 43676ab590c3f8686fd047d34c3e33803eef71f0 (diff) | |
| download | op-kernel-dev-eac56465b88cc9ad3b964a9f0a02be3d3a136ddf.zip op-kernel-dev-eac56465b88cc9ad3b964a9f0a02be3d3a136ddf.tar.gz | |
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index c24906d..001546f 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -25,7 +25,6 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len); 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 hard_iface *recv_if, int hdr_size); |
