From abce1f985ea9740093e433c1c16a72c690caa1df Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@uqat.ca>
Date: Mon, 3 Jun 2013 14:32:37 -0400
Subject: [PATCH] [lib] Rework owl_frequency_to_channel()

---
 libowlps/libowlps.c | 51 +++++++++++++++------------------------------
 libowlps/owlps.h    |  2 +-
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/libowlps/libowlps.c b/libowlps/libowlps.c
index 2fe55a8..bbb7f8c 100644
--- a/libowlps/libowlps.c
+++ b/libowlps/libowlps.c
@@ -88,57 +88,40 @@ bool owl_mac_equals(const uint8_t *const mac1,
  * Converts a IEEE 802.11 frequency into a channel number.
  * Returns 0 if the frequency does not correspond to an official channel.
  */
-uint_fast8_t owl_frequency_to_channel(const uint_fast16_t channel)
+uint_fast8_t owl_frequency_to_channel(const uint_fast16_t frequency)
 {
-  uint_fast8_t c = 0 ; // Result
-
-  switch (channel)
+  switch (frequency)
     {
     case OWL_80211_MHZ_CHANNEL_1 :
-      c = 1 ;
-      break ;
+      return 1 ;
     case OWL_80211_MHZ_CHANNEL_2 :
-      c = 2 ;
-      break ;
+      return 2 ;
     case OWL_80211_MHZ_CHANNEL_3 :
-      c = 3 ;
-      break ;
+      return 3 ;
     case OWL_80211_MHZ_CHANNEL_4 :
-      c = 4 ;
-      break ;
+      return 4 ;
     case OWL_80211_MHZ_CHANNEL_5 :
-      c = 5 ;
-      break ;
+      return 5 ;
     case OWL_80211_MHZ_CHANNEL_6 :
-      c = 6 ;
-      break ;
+      return 6 ;
     case OWL_80211_MHZ_CHANNEL_7 :
-      c = 7 ;
-      break ;
+      return 7 ;
     case OWL_80211_MHZ_CHANNEL_8 :
-      c = 8 ;
-      break ;
+      return 8 ;
     case OWL_80211_MHZ_CHANNEL_9 :
-      c = 9 ;
-      break ;
+      return 9 ;
     case OWL_80211_MHZ_CHANNEL_10 :
-      c = 10 ;
-      break ;
+      return 10 ;
     case OWL_80211_MHZ_CHANNEL_11 :
-      c = 11 ;
-      break ;
+      return 11 ;
     case OWL_80211_MHZ_CHANNEL_12 :
-      c = 12 ;
-      break ;
+      return 12 ;
     case OWL_80211_MHZ_CHANNEL_13 :
-      c = 13 ;
-      break ;
+      return 13 ;
     case OWL_80211_MHZ_CHANNEL_14 :
-      c = 14 ;
-      break ;
+      return 14 ;
     }
-
-  return c ;
+  return 0 ;
 }
 
 
diff --git a/libowlps/owlps.h b/libowlps/owlps.h
index c55c488..6b4826d 100644
--- a/libowlps/owlps.h
+++ b/libowlps/owlps.h
@@ -229,7 +229,7 @@ void owl_mac_bytes_to_string_r(const uint8_t *const mac_binary,
                                char mac_str[OWL_ETHER_ADDR_STRLEN]) ;
 bool owl_mac_equals(const uint8_t *const mac1,
                     const uint8_t *const mac2) ;
-uint_fast8_t owl_frequency_to_channel(const uint_fast16_t channel) ;
+uint_fast8_t owl_frequency_to_channel(const uint_fast16_t frequency) ;
 
 // Time
 int owl_msleep(uint32_t time_ms) ;