summaryrefslogtreecommitdiffstats
path: root/net/hsr
diff options
context:
space:
mode:
authoryuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>2017-06-18 10:52:04 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-20 13:30:15 -0400
commitb952f4dff2751252db073c27c0f8a16a416a2ddc (patch)
treefda132505741ee4d859ae09f45966656ea557572 /net/hsr
parentad941e693b24ad8b13c28382d323552ef6fb434b (diff)
net: manual clean code which call skb_put_[data:zero]
Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
-rw-r--r--net/hsr/hsr_device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 0a0a392dc2bd..4e7bdb213cd0 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -284,12 +284,12 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
284 skb_reset_mac_header(skb); 284 skb_reset_mac_header(skb);
285 285
286 if (hsrVer > 0) { 286 if (hsrVer > 0) {
287 hsr_tag = (typeof(hsr_tag)) skb_put(skb, sizeof(struct hsr_tag)); 287 hsr_tag = skb_put(skb, sizeof(struct hsr_tag));
288 hsr_tag->encap_proto = htons(ETH_P_PRP); 288 hsr_tag->encap_proto = htons(ETH_P_PRP);
289 set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE); 289 set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE);
290 } 290 }
291 291
292 hsr_stag = (typeof(hsr_stag)) skb_put(skb, sizeof(struct hsr_sup_tag)); 292 hsr_stag = skb_put(skb, sizeof(struct hsr_sup_tag));
293 set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf)); 293 set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf));
294 set_hsr_stag_HSR_Ver(hsr_stag, hsrVer); 294 set_hsr_stag_HSR_Ver(hsr_stag, hsrVer);
295 295
@@ -311,7 +311,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
311 hsr_stag->HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12; 311 hsr_stag->HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12;
312 312
313 /* Payload: MacAddressA */ 313 /* Payload: MacAddressA */
314 hsr_sp = (typeof(hsr_sp)) skb_put(skb, sizeof(struct hsr_sup_payload)); 314 hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));
315 ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr); 315 ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr);
316 316
317 skb_put_padto(skb, ETH_ZLEN + HSR_HLEN); 317 skb_put_padto(skb, ETH_ZLEN + HSR_HLEN);