diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-07 03:37:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-07 03:37:13 -0500 |
| commit | b8cec4a415e807a2f8679efa89558a040a7003de (patch) | |
| tree | 1a5fc7c31c4f8b55ea850599bb7309871165f48e /net/batman-adv/aggregation.h | |
| parent | 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 (diff) | |
| parent | e44d8fe2b5c27ecc230f886d4cc49fcbd86f87a0 (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 6ce305b40017..062204289d1f 100644 --- a/net/batman-adv/aggregation.h +++ b/net/batman-adv/aggregation.h | |||
| @@ -35,9 +35,9 @@ static inline int aggregated_packet(int buff_pos, int packet_len, int num_hna) | |||
| 35 | 35 | ||
| 36 | void add_bat_packet_to_list(struct bat_priv *bat_priv, | 36 | void add_bat_packet_to_list(struct bat_priv *bat_priv, |
| 37 | unsigned char *packet_buff, int packet_len, | 37 | unsigned char *packet_buff, int packet_len, |
| 38 | struct batman_if *if_incoming, char own_packet, | 38 | struct hard_iface *if_incoming, char own_packet, |
| 39 | unsigned long send_time); | 39 | unsigned long send_time); |
| 40 | void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, | 40 | void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, |
| 41 | int packet_len, struct batman_if *if_incoming); | 41 | int packet_len, struct hard_iface *if_incoming); |
| 42 | 42 | ||
| 43 | #endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */ | 43 | #endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */ |