aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-03-07 03:07:48 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-03-10 17:29:44 -0500
commit40e0c4f51d3fc3fd54edc797adae314fbe2b96a6 (patch)
tree68205612be6d2bd3301ac8a6999f9d302a5199f8 /net/batman-adv
parent96741ade15187bfde3dddc4092a88ba7a7c9183c (diff)
batman-adv: Remove spaces after a cast
Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/send.c2
-rw-r--r--net/batman-adv/unicast.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index f261ccffbd9d..af7a6741a685 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -56,7 +56,7 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
56 56
57 skb_reset_mac_header(skb); 57 skb_reset_mac_header(skb);
58 58
59 ethhdr = (struct ethhdr *) skb_mac_header(skb); 59 ethhdr = (struct ethhdr *)skb_mac_header(skb);
60 memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN); 60 memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN);
61 memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN); 61 memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
62 ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); 62 ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 0897dfa72c59..676f6a626b2c 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -66,7 +66,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head,
66 kfree_skb(tmp_skb); 66 kfree_skb(tmp_skb);
67 67
68 memmove(skb->data + uni_diff, skb->data, hdr_len); 68 memmove(skb->data + uni_diff, skb->data, hdr_len);
69 unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff); 69 unicast_packet = (struct unicast_packet *)skb_pull(skb, uni_diff);
70 unicast_packet->header.packet_type = BAT_UNICAST; 70 unicast_packet->header.packet_type = BAT_UNICAST;
71 71
72 return skb; 72 return skb;
@@ -238,7 +238,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
238 goto dropped; 238 goto dropped;
239 skb_reserve(frag_skb, ucf_hdr_len); 239 skb_reserve(frag_skb, ucf_hdr_len);
240 240
241 unicast_packet = (struct unicast_packet *) skb->data; 241 unicast_packet = (struct unicast_packet *)skb->data;
242 memcpy(&tmp_uc, unicast_packet, uc_hdr_len); 242 memcpy(&tmp_uc, unicast_packet, uc_hdr_len);
243 skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len); 243 skb_split(skb, frag_skb, data_len / 2 + uc_hdr_len);
244 244