diff options
| author | Simon Wunderlich <simon@open-mesh.com> | 2013-11-13 19:14:49 +0100 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2014-01-12 14:41:14 +0100 |
| commit | ef0a937f7a1450d3a133ccd83c9c7d07587e7a00 (patch) | |
| tree | c6118349ffdb8d12835f3aa0c8d9ca24a385c577 /net/batman-adv/types.h | |
| parent | c039876892e3247928ce5ad3d0ba46aee7d7099a (diff) | |
| download | linux-ef0a937f7a1450d3a133ccd83c9c7d07587e7a00.tar.bz2 | |
batman-adv: consider outgoing interface in OGM sending
The current OGM sending an aggregation functionality decides on
which interfaces a packet should be sent when it parses the forward
packet struct. However, with the network wide multi interface
optimization the outgoing interface is decided by the OGM processing
function.
This is reflected by moving the decision in the OGM processing function
and add the outgoing interface in the forwarding packet struct. This
practically implies that an OGM may be added multiple times (once per
outgoing interface), and this also affects aggregation which needs to
consider the outgoing interface as well.
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/types.h')
| -rw-r--r-- | net/batman-adv/types.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index d3e2bf486ec0..c317dfc932bf 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1018,8 +1018,10 @@ struct batadv_skb_cb { * @direct_link_flags: direct link flags for aggregated OGM packets * @num_packets: counter for bcast packet retransmission * @delayed_work: work queue callback item for packet sending - * @if_incoming: pointer incoming hard-iface or primary iface if locally - * generated packet + * @if_incoming: pointer to incoming hard-iface or primary iface if + * locally generated packet + * @if_outgoing: packet where the packet should be sent to, or NULL if + * unspecified */ struct batadv_forw_packet { struct hlist_node list; @@ -1031,6 +1033,7 @@ struct batadv_forw_packet { uint8_t num_packets; struct delayed_work delayed_work; struct batadv_hard_iface *if_incoming; + struct batadv_hard_iface *if_outgoing; }; /** |