The following commit has been merged in the next branch: commit f3dcc0df20865f1e3dd5c6832b33ccea91af552a Author: Sven Eckelmann sven@narfation.org Date: Wed Mar 7 09:07:48 2012 +0100

batman-adv: Remove spaces after a cast

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

diff --git a/send.c b/send.c index f261ccf..af7a674 100644 --- a/send.c +++ b/send.c @@ -56,7 +56,7 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,

skb_reset_mac_header(skb);

- ethhdr = (struct ethhdr *) skb_mac_header(skb); + ethhdr = (struct ethhdr *)skb_mac_header(skb); memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN); memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN); ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); diff --git a/unicast.c b/unicast.c index 0897dfa..676f6a6 100644 --- a/unicast.c +++ b/unicast.c @@ -66,7 +66,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, kfree_skb(tmp_skb);

memmove(skb->data + uni_diff, skb->data, hdr_len); - unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff); + unicast_packet = (struct unicast_packet *)skb_pull(skb, uni_diff); unicast_packet->header.packet_type = BAT_UNICAST;

return skb; @@ -238,7 +238,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, goto dropped; skb_reserve(frag_skb, ucf_hdr_len);

- unicast_packet = (struct unicast_packet *) skb->data; + unicast_packet = (struct unicast_packet *)skb->data; memcpy(&tmp_uc, unicast_packet, uc_hdr_len); skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len);