diff options
Diffstat (limited to 'net/batman-adv/aggregation.c')
-rw-r--r-- | net/batman-adv/aggregation.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/aggregation.c b/net/batman-adv/aggregation.c index 1997725a243b..af45d6b2031f 100644 --- a/net/batman-adv/aggregation.c +++ b/net/batman-adv/aggregation.c | |||
@@ -35,7 +35,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, | |||
35 | int packet_len, | 35 | int packet_len, |
36 | unsigned long send_time, | 36 | unsigned long send_time, |
37 | bool directlink, | 37 | bool directlink, |
38 | struct batman_if *if_incoming, | 38 | struct hard_iface *if_incoming, |
39 | struct forw_packet *forw_packet) | 39 | struct forw_packet *forw_packet) |
40 | { | 40 | { |
41 | struct batman_packet *batman_packet = | 41 | struct batman_packet *batman_packet = |
@@ -99,7 +99,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, | |||
99 | /* create a new aggregated packet and add this packet to it */ | 99 | /* create a new aggregated packet and add this packet to it */ |
100 | static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, | 100 | static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, |
101 | unsigned long send_time, bool direct_link, | 101 | unsigned long send_time, bool direct_link, |
102 | struct batman_if *if_incoming, | 102 | struct hard_iface *if_incoming, |
103 | int own_packet) | 103 | int own_packet) |
104 | { | 104 | { |
105 | struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); | 105 | struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); |
@@ -188,7 +188,7 @@ static void aggregate(struct forw_packet *forw_packet_aggr, | |||
188 | 188 | ||
189 | void add_bat_packet_to_list(struct bat_priv *bat_priv, | 189 | void add_bat_packet_to_list(struct bat_priv *bat_priv, |
190 | unsigned char *packet_buff, int packet_len, | 190 | unsigned char *packet_buff, int packet_len, |
191 | struct batman_if *if_incoming, char own_packet, | 191 | struct hard_iface *if_incoming, char own_packet, |
192 | unsigned long send_time) | 192 | unsigned long send_time) |
193 | { | 193 | { |
194 | /** | 194 | /** |
@@ -247,7 +247,7 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, | |||
247 | 247 | ||
248 | /* unpack the aggregated packets and process them one by one */ | 248 | /* unpack the aggregated packets and process them one by one */ |
249 | void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, | 249 | void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, |
250 | int packet_len, struct batman_if *if_incoming) | 250 | int packet_len, struct hard_iface *if_incoming) |
251 | { | 251 | { |
252 | struct batman_packet *batman_packet; | 252 | struct batman_packet *batman_packet; |
253 | int buff_pos = 0; | 253 | int buff_pos = 0; |