diff options
author | Linus Lüssing <linus.luessing@ascom.ch> | 2011-03-02 12:39:31 -0500 |
---|---|---|
committer | Marek Lindner <lindner_marek@yahoo.de> | 2011-03-05 06:52:08 -0500 |
commit | 7cefb149a6b0e4f7c5adfa27dcf285b729063848 (patch) | |
tree | 3b4d041fd21905286602c3319d94f591a344b8f3 /net/batman-adv | |
parent | e6c10f433af9c98994c94a10ae862c152fcfb2a9 (diff) |
batman-adv: Remove unused hdr_size variable in route_unicast_packet()
Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv')
-rw-r--r-- | net/batman-adv/routing.c | 7 | ||||
-rw-r--r-- | net/batman-adv/routing.h | 3 | ||||
-rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 42cb6e2e44f5..c172f5d0e05a 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -1263,8 +1263,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) | |||
1263 | return 0; | 1263 | return 0; |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, | 1266 | int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) |
1267 | int hdr_size) | ||
1268 | { | 1267 | { |
1269 | struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); | 1268 | struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); |
1270 | struct orig_node *orig_node = NULL; | 1269 | struct orig_node *orig_node = NULL; |
@@ -1365,7 +1364,7 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) | |||
1365 | return NET_RX_SUCCESS; | 1364 | return NET_RX_SUCCESS; |
1366 | } | 1365 | } |
1367 | 1366 | ||
1368 | return route_unicast_packet(skb, recv_if, hdr_size); | 1367 | return route_unicast_packet(skb, recv_if); |
1369 | } | 1368 | } |
1370 | 1369 | ||
1371 | int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if) | 1370 | 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) | |||
1398 | return NET_RX_SUCCESS; | 1397 | return NET_RX_SUCCESS; |
1399 | } | 1398 | } |
1400 | 1399 | ||
1401 | return route_unicast_packet(skb, recv_if, hdr_size); | 1400 | return route_unicast_packet(skb, recv_if); |
1402 | } | 1401 | } |
1403 | 1402 | ||
1404 | 1403 | ||
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 5efceaf4b978..b5a064c88a4f 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h | |||
@@ -30,8 +30,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, | |||
30 | void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, | 30 | void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, |
31 | struct neigh_node *neigh_node, unsigned char *hna_buff, | 31 | struct neigh_node *neigh_node, unsigned char *hna_buff, |
32 | int hna_buff_len); | 32 | int hna_buff_len); |
33 | int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, | 33 | int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
34 | int hdr_size); | ||
35 | int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 34 | int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
36 | int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 35 | int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
37 | int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 36 | int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 95d1c3f86a66..6b514ecee5a2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -462,7 +462,7 @@ void interface_rx(struct net_device *soft_iface, | |||
462 | 462 | ||
463 | memcpy(unicast_packet->dest, | 463 | memcpy(unicast_packet->dest, |
464 | bat_priv->softif_neigh->addr, ETH_ALEN); | 464 | bat_priv->softif_neigh->addr, ETH_ALEN); |
465 | ret = route_unicast_packet(skb, recv_if, hdr_size); | 465 | ret = route_unicast_packet(skb, recv_if); |
466 | if (ret == NET_RX_DROP) | 466 | if (ret == NET_RX_DROP) |
467 | goto dropped; | 467 | goto dropped; |
468 | 468 | ||