diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-30 22:53:18 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-30 22:53:18 (GMT) |
| commit | a230e033845853ebcfd21aae7a019a5392ebd30e (patch) | |
| tree | 0a9c5cb054513d4c0cc08aa1f3c80102546a3241 /net/batman-adv/translation-table.h | |
| parent | cbb963deed7bbf206f5077ab5742bee00ceefa46 (diff) | |
| parent | 6715fd3f0538e805b6a769d66823ec16b8b647ac (diff) | |
| download | linux-fsl-qoriq-a230e033845853ebcfd21aae7a019a5392ebd30e.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- reduce broadcast overhead on non-lossy wired links
- fix typos in kernel doc
- use eth_hdr() when possible
- use netdev_allock_skb_ip_align() and don't deal with NET_IP_ALIGN
- change VID semantic in the BLA component
- other minor cleanups and code refactoring
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/translation-table.h')
| -rw-r--r-- | net/batman-adv/translation-table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index ab8e683..659a3bb 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -33,7 +33,7 @@ void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, const unsigned char *tt_buff, int tt_buff_len); int batadv_tt_global_add(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, - const unsigned char *addr, uint8_t flags, + const unsigned char *addr, uint16_t flags, uint8_t ttvn); int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, |