aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/hsr/hsr_forward.c2
-rw-r--r--net/hsr/hsr_framereg.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index c4dfc2966f62..43f91651ba10 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -105,7 +105,7 @@ static struct sk_buff *create_stripped_skb(struct sk_buff *skb_in,
105 if (skb->ip_summed == CHECKSUM_PARTIAL) 105 if (skb->ip_summed == CHECKSUM_PARTIAL)
106 skb->csum_start -= HSR_HLEN; 106 skb->csum_start -= HSR_HLEN;
107 107
108 copylen = 2*ETH_ALEN; 108 copylen = 2 * ETH_ALEN;
109 if (frame->is_vlan) 109 if (frame->is_vlan)
110 copylen += VLAN_HLEN; 110 copylen += VLAN_HLEN;
111 src = skb_mac_header(skb_in); 111 src = skb_mac_header(skb_in);
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 1571ac101757..e61892506c66 100644
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -385,9 +385,9 @@ void hsr_prune_nodes(struct timer_list *t)
385 time_b = node->time_in[HSR_PT_SLAVE_B]; 385 time_b = node->time_in[HSR_PT_SLAVE_B];
386 386
387 /* Check for timestamps old enough to risk wrap-around */ 387 /* Check for timestamps old enough to risk wrap-around */
388 if (time_after(jiffies, time_a + MAX_JIFFY_OFFSET/2)) 388 if (time_after(jiffies, time_a + MAX_JIFFY_OFFSET / 2))
389 node->time_in_stale[HSR_PT_SLAVE_A] = true; 389 node->time_in_stale[HSR_PT_SLAVE_A] = true;
390 if (time_after(jiffies, time_b + MAX_JIFFY_OFFSET/2)) 390 if (time_after(jiffies, time_b + MAX_JIFFY_OFFSET / 2))
391 node->time_in_stale[HSR_PT_SLAVE_B] = true; 391 node->time_in_stale[HSR_PT_SLAVE_B] = true;
392 392
393 /* Get age of newest frame from node. 393 /* Get age of newest frame from node.
@@ -402,7 +402,7 @@ void hsr_prune_nodes(struct timer_list *t)
402 402
403 /* Warn of ring error only as long as we get frames at all */ 403 /* Warn of ring error only as long as we get frames at all */
404 if (time_is_after_jiffies(timestamp + 404 if (time_is_after_jiffies(timestamp +
405 msecs_to_jiffies(1.5*MAX_SLAVE_DIFF))) { 405 msecs_to_jiffies(1.5 * MAX_SLAVE_DIFF))) {
406 rcu_read_lock(); 406 rcu_read_lock();
407 port = get_late_port(hsr, node); 407 port = get_late_port(hsr, node);
408 if (port) 408 if (port)