Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest

[mv-sheeva.git] / drivers / staging / rtl8712 / rtl871x_ioctl_linux.c

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 862ac45c52878f02fd254c9641ad83693640378c..685a7b112d4bf48e61bbdd49cbda26b1abee29f3 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -62,17 +62,6 @@ static const char * const iw_operation_mode[] = {
         "Monitor"
 };
 
-static int hex2num_i(char c)
-{
-       if (c >= '0' && c <= '9')
-               return c - '0';
-       if (c >= 'a' && c <= 'f')
-               return c - 'a' + 10;
-       if (c >= 'A' && c <= 'F')
-               return c - 'A' + 10;
-       return -1;
-}
-
 /**
  * hwaddr_aton - Convert ASCII string to MAC address
  * @txt: MAC address as a string (e.g., "00:11:22:33:44:55")
@@ -86,10 +75,10 @@ static int hwaddr_aton_i(const char *txt, u8 *addr)
        for (i = 0; i < 6; i++) {
                int a, b;
 
-               a = hex2num_i(*txt++);
+               a = hex_to_bin(*txt++);
                if (a < 0)
                        return -1;
-               b = hex2num_i(*txt++);
+               b = hex_to_bin(*txt++);
                if (b < 0)
                        return -1;
                *addr++ = (a << 4) | b;
@@ -1371,6 +1360,8 @@ static int r8711_wx_get_rate(struct net_device *dev,
                                            135) : ((short_GI) ? 72 : 65);
                        max_rate *= 2; /* Mbps/2 */
                        wrqu->bitrate.value = max_rate * 500000;
+               } else {
+                       wrqu->bitrate.value = max_rate * 500000;
                }
        } else
                return -1;
@@ -1926,8 +1917,7 @@ static int r871x_get_ap_info(struct net_device *dev,
                                                                        irqL);
                        return -EINVAL;
                }
-               printk(KERN_INFO "r8712u: BSSID:" MACSTR "\n",
-                      MAC2STR(bssid));
+               printk(KERN_INFO "r8712u: BSSID:%pM\n", bssid);
                if (!memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN)) {
                        /* BSSID match, then check if supporting wpa/wpa2 */
                        pbuf = r8712_get_wpa_ie(&pnetwork->network.IEs[12],