diff options
author | Marek Lindner <lindner_marek@yahoo.de> | 2011-02-18 15:33:20 +0300 |
---|---|---|
committer | Marek Lindner <lindner_marek@yahoo.de> | 2011-03-05 14:52:06 +0300 |
commit | e6c10f433af9c98994c94a10ae862c152fcfb2a9 (patch) | |
tree | 56b4a82b83da44f7c3657a283c92c5cc8e248b9f /net/batman-adv/aggregation.c | |
parent | 4389e47af856635eb17d03b2572a50576c12db24 (diff) | |
download | linux-e6c10f433af9c98994c94a10ae862c152fcfb2a9.tar.xz |
batman-adv: rename batman_if struct to hard_iface
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
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, int packet_len, unsigned long send_time, bool directlink, - struct batman_if *if_incoming, + struct hard_iface *if_incoming, struct forw_packet *forw_packet) { struct batman_packet *batman_packet = @@ -99,7 +99,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, /* create a new aggregated packet and add this packet to it */ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, unsigned long send_time, bool direct_link, - struct batman_if *if_incoming, + struct hard_iface *if_incoming, int own_packet) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); @@ -188,7 +188,7 @@ static void aggregate(struct forw_packet *forw_packet_aggr, void add_bat_packet_to_list(struct bat_priv *bat_priv, unsigned char *packet_buff, int packet_len, - struct batman_if *if_incoming, char own_packet, + struct hard_iface *if_incoming, char own_packet, unsigned long send_time) { /** @@ -247,7 +247,7 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv, /* unpack the aggregated packets and process them one by one */ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, - int packet_len, struct batman_if *if_incoming) + int packet_len, struct hard_iface *if_incoming) { struct batman_packet *batman_packet; int buff_pos = 0; |