The following commit has been merged in the next branch: commit b708f88c054cf7202a70ef672a384caa2f2f1ed8 Author: Sven Eckelmann sven@narfation.org Date: Tue Feb 28 11:13:45 2012 +0100

batman-adv: Fix indentation of multiline statements

79b67f7add9982115e801e99fcfa92f27ff7bb12 and 0591c25abca985273be2aa47d128df0648184abd introduced a regression of the indentation of multiline statements.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/distributed-arp-table.c b/distributed-arp-table.c index a22bcda..8a20961 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -298,6 +298,7 @@ static uint16_t arp_get_type(struct bat_priv *bat_priv, struct sk_buff *skb, { struct arphdr *arphdr; struct ethhdr *ethhdr; + uint32_t ip_src, ip_dst; uint16_t type = 0;

/* pull the ethernet header */ @@ -332,10 +333,10 @@ static uint16_t arp_get_type(struct bat_priv *bat_priv, struct sk_buff *skb,

/* Check for bad reply/request. If the ARP message is not sane, DAT * will simply ignore it */ - if (ipv4_is_loopback(ARP_IP_SRC(skb, hdr_size)) || - ipv4_is_multicast(ARP_IP_SRC(skb, hdr_size)) || - ipv4_is_loopback(ARP_IP_DST(skb, hdr_size)) || - ipv4_is_multicast(ARP_IP_DST(skb, hdr_size))) + ip_src = ARP_IP_SRC(skb, hdr_size); + ip_dst = ARP_IP_DST(skb, hdr_size); + if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || + ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst)) goto out;

type = ntohs(arphdr->ar_op); @@ -538,9 +539,8 @@ bool dat_drop_broadcast_packet(struct bat_priv *bat_priv, /* If this packet is an ARP_REQUEST and we already have the information * that it is going to ask, we can drop the packet */ if (!forw_packet->num_packets && - (arp_get_type(bat_priv, forw_packet->skb, - sizeof(struct bcast_packet)) == - ARPOP_REQUEST)) { + (ARPOP_REQUEST == arp_get_type(bat_priv, forw_packet->skb, + sizeof(struct bcast_packet)))) { n = neigh_lookup(&arp_tbl, &ARP_IP_DST(forw_packet->skb, sizeof(struct bcast_packet)),