aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/unicast.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-11 18:36:34 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-11 18:36:34 -0400
commite8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258 (patch)
tree222115ab13209862ffdf35c11c9f7923a059188c /net/batman-adv/unicast.c
parentbb092c0db883d435d9d774e10b4cf71f12aad122 (diff)
parent40e0c4f51d3fc3fd54edc797adae314fbe2b96a6 (diff)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/unicast.c')
-rw-r--r--net/batman-adv/unicast.c4
1 files changed, 2 insertions, 2 deletions
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