*: make consistent & update GPLv2 file headers

[mirror_frr.git] / eigrpd / eigrp_interface.c

diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c
index 645b70d23ba8f9ec09906f8f1f6d28de80186651..d7e6092383397d14163e8bd846eccf5a5bcd8239 100644 (file)
--- a/eigrpd/eigrp_interface.c
+++ b/eigrpd/eigrp_interface.c
@@ -24,10 +24,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -276,7 +275,7 @@ eigrp_if_up (struct eigrp_interface *ei)
   /* Set multicast memberships appropriately for new state. */
   eigrp_if_set_multicast (ei);
 
-  thread_add_event (master, eigrp_hello_timer, ei, (1));
+  thread_add_event(master, eigrp_hello_timer, ei, (1), NULL);
 
   /*Prepare metrics*/
   metric.bandwith = eigrp_bandwidth_to_scaled (EIGRP_IF_PARAM (ei,bandwidth));
@@ -589,7 +588,7 @@ eigrp_if_lookup_recv_if (struct eigrp *eigrp, struct in_addr src,
 u_int32_t
 eigrp_bandwidth_to_scaled (u_int32_t bandwidth)
 {
-  u_int64_t temp_bandwidth = (256ull * 10000000) / bandwidth;
+  uint64_t temp_bandwidth = (256ull * 10000000) / bandwidth;
 
   temp_bandwidth =
     temp_bandwidth < EIGRP_MAX_METRIC ? temp_bandwidth : EIGRP_MAX_METRIC;
@@ -600,7 +599,7 @@ eigrp_bandwidth_to_scaled (u_int32_t bandwidth)
 u_int32_t
 eigrp_scaled_to_bandwidth (u_int32_t scaled)
 {
-  u_int64_t temp_scaled = scaled * (256ull * 10000000);
+  uint64_t temp_scaled = scaled * (256ull * 10000000);
 
   temp_scaled =
     temp_scaled < EIGRP_MAX_METRIC ? temp_scaled : EIGRP_MAX_METRIC;