diff options
author | Murali Karicheri <m-karicheri2@ti.com> | 2019-04-05 13:31:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-06 21:32:21 -0400 |
commit | 4fe25bd8c3e74519e3a0682b001d248fdf23838b (patch) | |
tree | e6143f7ee2aeeabaff6d8b4d9665c7f02d86d805 /net/hsr | |
parent | 5670342ced28b87f598d97e49d27bd99b38c1665 (diff) |
net: hsr: fix alignment issues in the code for functions
This patch fixes alignment issues in code for functions. This is
seen when ran checkpatch.pl -f option on files under net/hsr.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
-rw-r--r-- | net/hsr/hsr_device.c | 6 | ||||
-rw-r--r-- | net/hsr/hsr_framereg.c | 2 | ||||
-rw-r--r-- | net/hsr/hsr_netlink.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index cf5c3951d35a..0aea1bd09526 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c | |||
@@ -243,7 +243,7 @@ static const struct header_ops hsr_header_ops = { | |||
243 | }; | 243 | }; |
244 | 244 | ||
245 | static void send_hsr_supervision_frame(struct hsr_port *master, | 245 | static void send_hsr_supervision_frame(struct hsr_port *master, |
246 | u8 type, u8 hsrVer) | 246 | u8 type, u8 hsrVer) |
247 | { | 247 | { |
248 | struct sk_buff *skb; | 248 | struct sk_buff *skb; |
249 | int hlen, tlen; | 249 | int hlen, tlen; |
@@ -331,13 +331,13 @@ static void hsr_announce(struct timer_list *t) | |||
331 | 331 | ||
332 | if (hsr->announce_count < 3 && hsr->protVersion == 0) { | 332 | if (hsr->announce_count < 3 && hsr->protVersion == 0) { |
333 | send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE, | 333 | send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE, |
334 | hsr->protVersion); | 334 | hsr->protVersion); |
335 | hsr->announce_count++; | 335 | hsr->announce_count++; |
336 | 336 | ||
337 | interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL); | 337 | interval = msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL); |
338 | } else { | 338 | } else { |
339 | send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK, | 339 | send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK, |
340 | hsr->protVersion); | 340 | hsr->protVersion); |
341 | 341 | ||
342 | interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL); | 342 | interval = msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL); |
343 | } | 343 | } |
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 47dbaf2faefa..78fca38ffa9f 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c | |||
@@ -105,7 +105,7 @@ int hsr_create_self_node(struct list_head *self_node_db, | |||
105 | 105 | ||
106 | rcu_read_lock(); | 106 | rcu_read_lock(); |
107 | oldnode = list_first_or_null_rcu(self_node_db, | 107 | oldnode = list_first_or_null_rcu(self_node_db, |
108 | struct hsr_node, mac_list); | 108 | struct hsr_node, mac_list); |
109 | if (oldnode) { | 109 | if (oldnode) { |
110 | list_replace_rcu(&oldnode->mac_list, &node->mac_list); | 110 | list_replace_rcu(&oldnode->mac_list, &node->mac_list); |
111 | rcu_read_unlock(); | 111 | rcu_read_unlock(); |
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index 445cd21c825f..654eb5b46615 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c | |||
@@ -270,8 +270,8 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid, | 272 | msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid, |
273 | info->snd_seq, &hsr_genl_family, 0, | 273 | info->snd_seq, &hsr_genl_family, 0, |
274 | HSR_C_SET_NODE_STATUS); | 274 | HSR_C_SET_NODE_STATUS); |
275 | if (!msg_head) { | 275 | if (!msg_head) { |
276 | res = -ENOMEM; | 276 | res = -ENOMEM; |
277 | goto nla_put_failure; | 277 | goto nla_put_failure; |
@@ -295,7 +295,7 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info) | |||
295 | goto nla_put_failure; | 295 | goto nla_put_failure; |
296 | 296 | ||
297 | res = nla_put(skb_out, HSR_A_NODE_ADDR, ETH_ALEN, | 297 | res = nla_put(skb_out, HSR_A_NODE_ADDR, ETH_ALEN, |
298 | nla_data(info->attrs[HSR_A_NODE_ADDR])); | 298 | nla_data(info->attrs[HSR_A_NODE_ADDR])); |
299 | if (res < 0) | 299 | if (res < 0) |
300 | goto nla_put_failure; | 300 | goto nla_put_failure; |
301 | 301 | ||
@@ -396,8 +396,8 @@ static int hsr_get_node_list(struct sk_buff *skb_in, struct genl_info *info) | |||
396 | } | 396 | } |
397 | 397 | ||
398 | msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid, | 398 | msg_head = genlmsg_put(skb_out, NETLINK_CB(skb_in).portid, |
399 | info->snd_seq, &hsr_genl_family, 0, | 399 | info->snd_seq, &hsr_genl_family, 0, |
400 | HSR_C_SET_NODE_LIST); | 400 | HSR_C_SET_NODE_LIST); |
401 | if (!msg_head) { | 401 | if (!msg_head) { |
402 | res = -ENOMEM; | 402 | res = -ENOMEM; |
403 | goto nla_put_failure; | 403 | goto nla_put_failure; |