diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-08 15:39:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-08 15:39:11 -0700 |
| commit | 02e73c1edc3746e308d1768a27fdc8121f641ab1 (patch) | |
| tree | a3db8009e4549e3d85905e11ac2bf8e64df1763f /net/batman-adv/aggregation.h | |
| parent | c5216cc70fa769e5a51837f2cf07c4a0aa734fcf (diff) | |
| parent | 27aea2128ec09924dfe08e97739b2bf8b15c8619 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/aggregation.h')
| -rw-r--r-- | net/batman-adv/aggregation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/aggregation.h b/net/batman-adv/aggregation.h index 062204289d1..7e6d72fbf54 100644 --- a/net/batman-adv/aggregation.h +++ b/net/batman-adv/aggregation.h @@ -25,9 +25,9 @@ #include "main.h" /* is there another aggregated packet here? */ -static inline int aggregated_packet(int buff_pos, int packet_len, int num_hna) +static inline int aggregated_packet(int buff_pos, int packet_len, int num_tt) { - int next_buff_pos = buff_pos + BAT_PACKET_LEN + (num_hna * ETH_ALEN); + int next_buff_pos = buff_pos + BAT_PACKET_LEN + (num_tt * ETH_ALEN); return (next_buff_pos <= packet_len) && (next_buff_pos <= MAX_AGGREGATION_BYTES); |