# HG changeset patch # User Florian Pose # Date 1466596156 -7200 # Node ID 0dc0873d4aed7b4d2e89b3ab3836561d70b3d1ba # Parent 717c331cc2278608fac90d9e03c43bb5da4411d7 Minor changes. diff -r 717c331cc227 -r 0dc0873d4aed master/ethernet.c --- a/master/ethernet.c Thu Jun 09 13:52:22 2016 +0200 +++ b/master/ethernet.c Wed Jun 22 13:49:16 2016 +0200 @@ -109,8 +109,9 @@ { struct sockaddr *addr = p; - if (!is_valid_ether_addr(addr->sa_data)) + if (!is_valid_ether_addr(addr->sa_data)) { return -EADDRNOTAVAIL; + } memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); @@ -390,8 +391,9 @@ data = ec_slave_mbox_prepare_send(eoe->slave, &eoe->datagram, EC_MBOX_TYPE_EOE, current_size + 4); - if (IS_ERR(data)) + if (IS_ERR(data)) { return PTR_ERR(data); + } EC_WRITE_U8 (data, EC_EOE_FRAMETYPE_INIT_REQ); // Initiate EoE Request EC_WRITE_U8 (data + 1, last_fragment); @@ -413,12 +415,14 @@ */ void ec_eoe_run(ec_eoe_t *eoe /**< EoE handler */) { - if (!eoe->opened) - return; + if (!eoe->opened) { + return; + } // if the datagram was not sent, or is not yet received, skip this cycle - if (eoe->queue_datagram || eoe->datagram.state == EC_DATAGRAM_SENT) - return; + if (eoe->queue_datagram || eoe->datagram.state == EC_DATAGRAM_SENT) { + return; + } // call state function eoe->state(eoe); @@ -932,8 +936,9 @@ EC_SLAVE_DBG(eoe->slave, 0, "EoE %s TX queued frame" " with %u octets (%u frames queued).\n", eoe->dev->name, skb->len, eoe->tx_queued_frames); - if (!eoe->tx_queue_active) + if (!eoe->tx_queue_active) { EC_SLAVE_WARN(eoe->slave, "EoE TX queue is now full.\n"); + } #endif return 0;