[01/12] batman-adv: Remove unused hdr_size variable in route_unicast_packet()
Commit Message
Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
---
routing.c | 7 +++----
routing.h | 3 +--
soft-interface.c | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
Comments
On Wednesday 02 March 2011 18:18:30 Linus Lüssing wrote:
> @@ -1263,8 +1263,7 @@ static int check_unicast_packet(struct sk_buff *skb,
> int hdr_size) return 0;
> }
>
> -int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if,
> - int hdr_size)
> +int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
> {
> struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
> struct orig_node *orig_node = NULL;
Applied in revision 1953.
Thanks,
Marek
@@ -1263,8 +1263,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
return 0;
}
-int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if,
- int hdr_size)
+int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
{
struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
struct orig_node *orig_node = NULL;
@@ -1365,7 +1364,7 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
return NET_RX_SUCCESS;
}
- return route_unicast_packet(skb, recv_if, hdr_size);
+ return route_unicast_packet(skb, recv_if);
}
int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
@@ -1398,7 +1397,7 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if)
return NET_RX_SUCCESS;
}
- return route_unicast_packet(skb, recv_if, hdr_size);
+ return route_unicast_packet(skb, recv_if);
}
@@ -30,8 +30,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
struct neigh_node *neigh_node, unsigned char *hna_buff,
int hna_buff_len);
-int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if,
- int hdr_size);
+int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if);
int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if);
int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if);
@@ -462,7 +462,7 @@ void interface_rx(struct net_device *soft_iface,
memcpy(unicast_packet->dest,
bat_priv->softif_neigh->addr, ETH_ALEN);
- ret = route_unicast_packet(skb, recv_if, hdr_size);
+ ret = route_unicast_packet(skb, recv_if);
if (ret == NET_RX_DROP)
goto dropped;