The following commit has been merged in the master branch: commit 4ca2a01e057606b8d5c08bb53dd62f95ffaf446b Author: Antonio Quartulli ordex@autistici.org Date: Mon Feb 27 13:36:40 2012 +0100

batman-adv: remove unused variable

Actually unicast_4addr_packet in interface_rx() is set but never used and therefore can be safely be removed.

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/soft-interface.c b/soft-interface.c index 8b68e01..92137af 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -259,7 +259,6 @@ void interface_rx(struct net_device *soft_iface, int hdr_size) { struct bat_priv *bat_priv = netdev_priv(soft_iface); - struct unicast_4addr_packet *unicast_4addr_packet; struct ethhdr *ethhdr; struct vlan_ethhdr *vhdr; short vid __maybe_unused = -1; @@ -268,8 +267,6 @@ void interface_rx(struct net_device *soft_iface, if (!pskb_may_pull(skb, hdr_size)) goto dropped;

- unicast_4addr_packet = (struct unicast_4addr_packet *)skb->data; - if (dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) goto out;