diff options
author | Quytelda Kahja <quytelda@tamalin.org> | 2018-03-29 01:51:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-29 05:50:39 -0400 |
commit | f40cd66b45b3fc2822e3abb254929c6e2820ab91 (patch) | |
tree | 4095c0053e4543fbbc6f9d7a1bd3251a47bb86a3 | |
parent | 019ec78508d5dd21589c3ff60ecbe90a54a7a14b (diff) |
staging: ks7010: Change mac_address_valid to a bool instead of int.
'mac_address_valid' is only ever assigned 0 or 1, so it makes more sense
to use a bool type for this variable.
Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 4 | ||||
-rw-r--r-- | drivers/staging/ks7010/ks_wlan.h | 2 | ||||
-rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 923f196213b6..676961cf4103 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c | |||
@@ -523,7 +523,7 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv) | |||
523 | /* MAC address */ | 523 | /* MAC address */ |
524 | hostif_sme_enqueue(priv, SME_GET_MAC_ADDRESS); | 524 | hostif_sme_enqueue(priv, SME_GET_MAC_ADDRESS); |
525 | memcpy(priv->eth_addr, priv->rxp, ETH_ALEN); | 525 | memcpy(priv->eth_addr, priv->rxp, ETH_ALEN); |
526 | priv->mac_address_valid = 1; | 526 | priv->mac_address_valid = true; |
527 | dev->dev_addr[0] = priv->eth_addr[0]; | 527 | dev->dev_addr[0] = priv->eth_addr[0]; |
528 | dev->dev_addr[1] = priv->eth_addr[1]; | 528 | dev->dev_addr[1] = priv->eth_addr[1]; |
529 | dev->dev_addr[2] = priv->eth_addr[2]; | 529 | dev->dev_addr[2] = priv->eth_addr[2]; |
@@ -638,7 +638,7 @@ void hostif_mib_set_confirm(struct ks_wlan_private *priv) | |||
638 | hostif_sme_enqueue(priv, SME_MULTICAST_CONFIRM); | 638 | hostif_sme_enqueue(priv, SME_MULTICAST_CONFIRM); |
639 | break; | 639 | break; |
640 | case LOCAL_CURRENTADDRESS: | 640 | case LOCAL_CURRENTADDRESS: |
641 | priv->mac_address_valid = 1; | 641 | priv->mac_address_valid = true; |
642 | break; | 642 | break; |
643 | case DOT11_RSN_CONFIG_MULTICAST_CIPHER: | 643 | case DOT11_RSN_CONFIG_MULTICAST_CIPHER: |
644 | hostif_sme_enqueue(priv, SME_RSN_MCAST_CONFIRM); | 644 | hostif_sme_enqueue(priv, SME_RSN_MCAST_CONFIRM); |
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index f1f6c88adcca..846bb1041850 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h | |||
@@ -456,7 +456,7 @@ struct ks_wlan_private { | |||
456 | unsigned char firmware_version[128 + 1]; | 456 | unsigned char firmware_version[128 + 1]; |
457 | int version_size; | 457 | int version_size; |
458 | 458 | ||
459 | int mac_address_valid; /* Mac Address Status */ | 459 | bool mac_address_valid; /* Mac Address Status */ |
460 | 460 | ||
461 | int dev_state; | 461 | int dev_state; |
462 | 462 | ||
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 9693e8fe98b9..9078e13b0d4a 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c | |||
@@ -2752,7 +2752,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr) | |||
2752 | memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len); | 2752 | memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len); |
2753 | memcpy(priv->eth_addr, mac_addr->sa_data, ETH_ALEN); | 2753 | memcpy(priv->eth_addr, mac_addr->sa_data, ETH_ALEN); |
2754 | 2754 | ||
2755 | priv->mac_address_valid = 0; | 2755 | priv->mac_address_valid = false; |
2756 | hostif_sme_enqueue(priv, SME_MACADDRESS_SET_REQUEST); | 2756 | hostif_sme_enqueue(priv, SME_MACADDRESS_SET_REQUEST); |
2757 | netdev_info(dev, "ks_wlan: MAC ADDRESS = %pM\n", priv->eth_addr); | 2757 | netdev_info(dev, "ks_wlan: MAC ADDRESS = %pM\n", priv->eth_addr); |
2758 | return 0; | 2758 | return 0; |
@@ -2875,7 +2875,7 @@ int ks_wlan_net_start(struct net_device *dev) | |||
2875 | /* int rc; */ | 2875 | /* int rc; */ |
2876 | 2876 | ||
2877 | priv = netdev_priv(dev); | 2877 | priv = netdev_priv(dev); |
2878 | priv->mac_address_valid = 0; | 2878 | priv->mac_address_valid = false; |
2879 | priv->need_commit = 0; | 2879 | priv->need_commit = 0; |
2880 | 2880 | ||
2881 | priv->device_open_status = 1; | 2881 | priv->device_open_status = 1; |