Skip to content

Commit

Permalink
net: hsr: remove unnecessary paranthesis from the code
Browse files Browse the repository at this point in the history
This patch fixes unnecessary paranthesis from the code. 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>
  • Loading branch information
Murali Karicheri authored and davem330 committed Apr 7, 2019
1 parent d473077 commit 5670342
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
7 changes: 3 additions & 4 deletions net/hsr/hsr_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static bool hsr_check_carrier(struct hsr_port *master)

rcu_read_lock();
hsr_for_each_port(master->hsr, port)
if ((port->type != HSR_PT_MASTER) && is_slave_up(port->dev)) {
if (port->type != HSR_PT_MASTER && is_slave_up(port->dev)) {
has_carrier = true;
break;
}
Expand All @@ -88,15 +88,14 @@ static void hsr_check_announce(struct net_device *hsr_dev,

hsr = netdev_priv(hsr_dev);

if ((hsr_dev->operstate == IF_OPER_UP)
&& (old_operstate != IF_OPER_UP)) {
if (hsr_dev->operstate == IF_OPER_UP && old_operstate != IF_OPER_UP) {
/* Went up */
hsr->announce_count = 0;
mod_timer(&hsr->announce_timer,
jiffies + msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL));
}

if ((hsr_dev->operstate != IF_OPER_UP) && (old_operstate == IF_OPER_UP))
if (hsr_dev->operstate != IF_OPER_UP && old_operstate == IF_OPER_UP)
/* Went down */
del_timer(&hsr->announce_timer);
}
Expand Down
23 changes: 11 additions & 12 deletions net/hsr/hsr_forward.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)
&((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;
}

if ((hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE) &&
(hsrSupTag->HSR_TLV_Type != HSR_TLV_LIFE_CHECK))
if (hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE &&
hsrSupTag->HSR_TLV_Type != HSR_TLV_LIFE_CHECK)
return false;
if ((hsrSupTag->HSR_TLV_Length != 12) &&
(hsrSupTag->HSR_TLV_Length !=
sizeof(struct hsr_sup_payload)))
if (hsrSupTag->HSR_TLV_Length != 12 &&
hsrSupTag->HSR_TLV_Length != sizeof(struct hsr_sup_payload))
return false;

return true;
Expand Down Expand Up @@ -191,7 +190,7 @@ static struct sk_buff *frame_get_tagged_skb(struct hsr_frame_info *frame,
if (frame->skb_hsr)
return skb_clone(frame->skb_hsr, GFP_ATOMIC);

if ((port->type != HSR_PT_SLAVE_A) && (port->type != HSR_PT_SLAVE_B)) {
if (port->type != HSR_PT_SLAVE_A && port->type != HSR_PT_SLAVE_B) {
WARN_ONCE(1, "HSR: Bug: trying to create a tagged frame for a non-ring port");
return NULL;
}
Expand Down Expand Up @@ -255,19 +254,19 @@ static void hsr_forward_do(struct hsr_frame_info *frame)
continue;

/* Don't deliver locally unless we should */
if ((port->type == HSR_PT_MASTER) && !frame->is_local_dest)
if (port->type == HSR_PT_MASTER && !frame->is_local_dest)
continue;

/* Deliver frames directly addressed to us to master only */
if ((port->type != HSR_PT_MASTER) && frame->is_local_exclusive)
if (port->type != HSR_PT_MASTER && frame->is_local_exclusive)
continue;

/* Don't send frame over port where it has been sent before */
if (hsr_register_frame_out(port, frame->node_src,
frame->sequence_nr))
continue;

if (frame->is_supervision && (port->type == HSR_PT_MASTER)) {
if (frame->is_supervision && port->type == HSR_PT_MASTER) {
hsr_handle_sup_frame(frame->skb_hsr,
frame->node_src,
frame->port_rcv);
Expand Down Expand Up @@ -301,9 +300,9 @@ static void check_local_dest(struct hsr_priv *hsr, struct sk_buff *skb,
frame->is_local_exclusive = false;
}

if ((skb->pkt_type == PACKET_HOST) ||
(skb->pkt_type == PACKET_MULTICAST) ||
(skb->pkt_type == PACKET_BROADCAST)) {
if (skb->pkt_type == PACKET_HOST ||
skb->pkt_type == PACKET_MULTICAST ||
skb->pkt_type == PACKET_BROADCAST) {
frame->is_local_dest = true;
} else {
frame->is_local_dest = false;
Expand Down
4 changes: 2 additions & 2 deletions net/hsr/hsr_slave.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ bool hsr_port_exists(const struct net_device *dev)
static int hsr_check_dev_ok(struct net_device *dev)
{
/* Don't allow HSR on non-ethernet like devices */
if ((dev->flags & IFF_LOOPBACK) || (dev->type != ARPHRD_ETHER) ||
(dev->addr_len != ETH_ALEN)) {
if ((dev->flags & IFF_LOOPBACK) || dev->type != ARPHRD_ETHER ||
dev->addr_len != ETH_ALEN) {
netdev_info(dev, "Cannot use loopback or non-ethernet device as HSR slave.\n");
return -EINVAL;
}
Expand Down

0 comments on commit 5670342

Please sign in to comment.