net: hsr: fix lines exceeding 80 characters

This patch fixes lines exceeding 80 characters. This is seen
when ran checkpatch.pl with -f option for files under
net/hsr.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index 04b5450c5a5572e875f7900a3676fd80259b9b4b..5346127708ae1c59bd0a601f581681426f47b94c 100644 (file)
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -75,7 +75,8 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)
 
                hsrSupTag = &hsrV1Hdr->hsr_sup;
        } else {
-               hsrSupTag = &((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;
+               hsrSupTag =
+                    &((struct hsrv0_ethhdr_sp *) skb_mac_header(skb))->hsr_sup;
        }
 
        if ((hsrSupTag->HSR_TLV_Type != HSR_TLV_ANNOUNCE) &&

diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c
index 9af16cb68f76b92bd929d4d941a5e8c9a04d779e..5cd74d99abe9ab7c3a4aa075b591c85f4517910b 100644 (file)
--- a/net/hsr/hsr_framereg.c
+++ b/net/hsr/hsr_framereg.c
@@ -255,7 +255,8 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr,
                if (!node_curr->time_in_stale[i] &&
                    time_after(node_curr->time_in[i], node_real->time_in[i])) {
                        node_real->time_in[i] = node_curr->time_in[i];
-                       node_real->time_in_stale[i] = node_curr->time_in_stale[i];
+                       node_real->time_in_stale[i] =
+                                               node_curr->time_in_stale[i];
                }
                if (seq_nr_after(node_curr->seq_out[i], node_real->seq_out[i]))
                        node_real->seq_out[i] = node_curr->seq_out[i];
@@ -308,7 +309,8 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,
        if (!is_unicast_ether_addr(eth_hdr(skb)->h_dest))
                return;
 
-       node_dst = find_node_by_AddrA(&port->hsr->node_db, eth_hdr(skb)->h_dest);
+       node_dst = find_node_by_AddrA(&port->hsr->node_db,
+                                     eth_hdr(skb)->h_dest);
        if (!node_dst) {
                WARN_ONCE(1, "%s: Unknown node\n", __func__);
                return;
@@ -419,7 +421,7 @@ void hsr_prune_nodes(struct timer_list *t)
 
                /* Prune old entries */
                if (time_is_before_jiffies(timestamp +
-                                       msecs_to_jiffies(HSR_NODE_FORGET_TIME))) {
+                               msecs_to_jiffies(HSR_NODE_FORGET_TIME))) {
                        hsr_nl_nodedown(hsr, node->MacAddressA);
                        list_del_rcu(&node->mac_list);
                        /* Note that we need to free this entry later: */

diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c
index cd37d0011b424824fd113ffd4da59f36c116996a..b7a4cf62286b37af38044755b15eeeddbf634088 100644 (file)
--- a/net/hsr/hsr_main.c
+++ b/net/hsr/hsr_main.c
@@ -63,7 +63,8 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,
 
                if (port->type == HSR_PT_SLAVE_A) {
                        ether_addr_copy(master->dev->dev_addr, dev->dev_addr);
-                       call_netdevice_notifiers(NETDEV_CHANGEADDR, master->dev);
+                       call_netdevice_notifiers(NETDEV_CHANGEADDR,
+                                                master->dev);
                }
 
                /* Make sure we recognize frames from ourselves in hsr_rcv() */

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index 9b9909e89e9e855851b2fa6ab8bed321cdcfafc7..6f05dc90aa9b2e50fdb6bdcc2fcf87bfdbcdc436 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -83,8 +83,8 @@ static inline u16 get_hsr_tag_LSDU_size(struct hsr_tag *ht)
 
 static inline void set_hsr_tag_path(struct hsr_tag *ht, u16 path)
 {
-       ht->path_and_LSDU_size = htons(
-                       (ntohs(ht->path_and_LSDU_size) & 0x0FFF) | (path << 12));
+       ht->path_and_LSDU_size =
+               htons((ntohs(ht->path_and_LSDU_size) & 0x0FFF) | (path << 12));
 }
 
 static inline void set_hsr_tag_LSDU_size(struct hsr_tag *ht, u16 LSDU_size)
@@ -171,8 +171,8 @@ struct hsr_priv {
        struct timer_list       prune_timer;
        int announce_count;
        u16 sequence_nr;
-       u16 sup_sequence_nr;                    /* For HSRv1 separate seq_nr for supervision */
-       u8 protVersion;                                 /* Indicate if HSRv0 or HSRv1. */
+       u16 sup_sequence_nr;    /* For HSRv1 separate seq_nr for supervision */
+       u8 protVersion;         /* Indicate if HSRv0 or HSRv1. */
        spinlock_t seqnr_lock;                  /* locking for sequence_nr */
        unsigned char           sup_multicast_addr[ETH_ALEN];
 };

diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
index bcc04d3e724f401d4cd1d91d683e9ff128c81432..110913e491c8f94a5cbbcd5fe7c937380289d832 100644 (file)
--- a/net/hsr/hsr_netlink.c
+++ b/net/hsr/hsr_netlink.c
@@ -47,12 +47,14 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev,
                netdev_info(dev, "HSR: Slave1 device not specified\n");
                return -EINVAL;
        }
-       link[0] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE1]));
+       link[0] = __dev_get_by_index(src_net,
+                                    nla_get_u32(data[IFLA_HSR_SLAVE1]));
        if (!data[IFLA_HSR_SLAVE2]) {
                netdev_info(dev, "HSR: Slave2 device not specified\n");
                return -EINVAL;
        }
-       link[1] = __dev_get_by_index(src_net, nla_get_u32(data[IFLA_HSR_SLAVE2]));
+       link[1] = __dev_get_by_index(src_net,
+                                    nla_get_u32(data[IFLA_HSR_SLAVE2]));
 
        if (!link[0] || !link[1])
                return -ENODEV;
@@ -156,7 +158,8 @@ void hsr_nl_ringerror(struct hsr_priv *hsr, unsigned char addr[ETH_ALEN],
        if (!skb)
                goto fail;
 
-       msg_head = genlmsg_put(skb, 0, 0, &hsr_genl_family, 0, HSR_C_RING_ERROR);
+       msg_head = genlmsg_put(skb, 0, 0, &hsr_genl_family, 0,
+                              HSR_C_RING_ERROR);
        if (!msg_head)
                goto nla_put_failure;
 
@@ -260,7 +263,7 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)
                goto invalid;
 
        hsr_dev = __dev_get_by_index(genl_info_net(info),
-                                       nla_get_u32(info->attrs[HSR_A_IFINDEX]));
+                                    nla_get_u32(info->attrs[HSR_A_IFINDEX]));
        if (!hsr_dev)
                goto invalid;
        if (!is_hsr_master(hsr_dev))
@@ -289,13 +292,14 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)
 
        hsr = netdev_priv(hsr_dev);
        res = hsr_get_node_data(hsr,
-                       (unsigned char *) nla_data(info->attrs[HSR_A_NODE_ADDR]),
-                       hsr_node_addr_b,
-                       &addr_b_ifindex,
-                       &hsr_node_if1_age,
-                       &hsr_node_if1_seq,
-                       &hsr_node_if2_age,
-                       &hsr_node_if2_seq);
+                               (unsigned char *)
+                               nla_data(info->attrs[HSR_A_NODE_ADDR]),
+                                        hsr_node_addr_b,
+                                        &addr_b_ifindex,
+                                        &hsr_node_if1_age,
+                                        &hsr_node_if1_seq,
+                                        &hsr_node_if2_age,
+                                        &hsr_node_if2_seq);
        if (res < 0)
                goto nla_put_failure;
 
@@ -306,11 +310,12 @@ static int hsr_get_node_status(struct sk_buff *skb_in, struct genl_info *info)
 
        if (addr_b_ifindex > -1) {
                res = nla_put(skb_out, HSR_A_NODE_ADDR_B, ETH_ALEN,
-                                                               hsr_node_addr_b);
+                             hsr_node_addr_b);
                if (res < 0)
                        goto nla_put_failure;
 
-               res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX, addr_b_ifindex);
+               res = nla_put_u32(skb_out, HSR_A_ADDR_B_IFINDEX,
+                                 addr_b_ifindex);
                if (res < 0)
                        goto nla_put_failure;
        }