aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSucheta Chakraborty <sucheta.chakraborty@qlogic.com>2014-01-23 17:18:28 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-23 19:13:08 -0500
commit72ebe3495f6f6829306ccf6c6a8b1b92c2c9b672 (patch)
treeee3f325746409853dbb693931028aabbe088c72a
parent0681a28264dcf948e0236adb7bf505a638c4dec1 (diff)
qlcnic: Use bool for rx_mac_learn.
o Use boolean type instead of u8. Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic.h2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c4
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 69a6ca086d5c..c85cb8428bf0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -1082,7 +1082,7 @@ struct qlcnic_adapter {
1082 u64 dev_rst_time; 1082 u64 dev_rst_time;
1083 bool drv_mac_learn; 1083 bool drv_mac_learn;
1084 bool fdb_mac_learn; 1084 bool fdb_mac_learn;
1085 u8 rx_mac_learn; 1085 bool rx_mac_learn;
1086 unsigned long vlans[BITS_TO_LONGS(VLAN_N_VID)]; 1086 unsigned long vlans[BITS_TO_LONGS(VLAN_N_VID)];
1087 u8 flash_mfg_id; 1087 u8 flash_mfg_id;
1088 struct qlcnic_npar_info *npars; 1088 struct qlcnic_npar_info *npars;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 294984584d1a..b66b199bd88c 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1637,7 +1637,7 @@ static void qlcnic_83xx_set_interface_id_promisc(struct qlcnic_adapter *adapter,
1637 if (qlcnic_sriov_pf_check(adapter)) { 1637 if (qlcnic_sriov_pf_check(adapter)) {
1638 qlcnic_alloc_lb_filters_mem(adapter); 1638 qlcnic_alloc_lb_filters_mem(adapter);
1639 qlcnic_pf_set_interface_id_promisc(adapter, interface_id); 1639 qlcnic_pf_set_interface_id_promisc(adapter, interface_id);
1640 adapter->rx_mac_learn = 1; 1640 adapter->rx_mac_learn = true;
1641 } else { 1641 } else {
1642 if (!qlcnic_sriov_vf_check(adapter)) 1642 if (!qlcnic_sriov_vf_check(adapter))
1643 *interface_id = adapter->recv_ctx->context_id << 16; 1643 *interface_id = adapter->recv_ctx->context_id << 16;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index 6d7f6a170869..f19cec860695 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2217,7 +2217,7 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac)
2217 struct qlcnic_hardware_context *ahw = adapter->ahw; 2217 struct qlcnic_hardware_context *ahw = adapter->ahw;
2218 int err = 0; 2218 int err = 0;
2219 2219
2220 adapter->rx_mac_learn = 0; 2220 adapter->rx_mac_learn = false;
2221 ahw->msix_supported = !!qlcnic_use_msi_x; 2221 ahw->msix_supported = !!qlcnic_use_msi_x;
2222 2222
2223 qlcnic_83xx_init_rings(adapter); 2223 qlcnic_83xx_init_rings(adapter);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
index e26c49fa87ab..be7d7a62cc0d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
@@ -227,10 +227,10 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
227 if (ahw->capabilities & QLC_83XX_ESWITCH_CAPABILITY) { 227 if (ahw->capabilities & QLC_83XX_ESWITCH_CAPABILITY) {
228 adapter->flags |= QLCNIC_ESWITCH_ENABLED; 228 adapter->flags |= QLCNIC_ESWITCH_ENABLED;
229 if (adapter->drv_mac_learn) 229 if (adapter->drv_mac_learn)
230 adapter->rx_mac_learn = 1; 230 adapter->rx_mac_learn = true;
231 } else { 231 } else {
232 adapter->flags &= ~QLCNIC_ESWITCH_ENABLED; 232 adapter->flags &= ~QLCNIC_ESWITCH_ENABLED;
233 adapter->rx_mac_learn = 0; 233 adapter->rx_mac_learn = false;
234 } 234 }
235 235
236 ahw->idc.vnic_state = QLCNIC_DEV_NPAR_NON_OPER; 236 ahw->idc.vnic_state = QLCNIC_DEV_NPAR_NON_OPER;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index e86147912922..d012e834636e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -547,10 +547,10 @@ static void __qlcnic_set_multi(struct net_device *netdev, u16 vlan)
547 qlcnic_alloc_lb_filters_mem(adapter); 547 qlcnic_alloc_lb_filters_mem(adapter);
548 adapter->drv_mac_learn = 1; 548 adapter->drv_mac_learn = 1;
549 if (adapter->flags & QLCNIC_ESWITCH_ENABLED) 549 if (adapter->flags & QLCNIC_ESWITCH_ENABLED)
550 adapter->rx_mac_learn = 1; 550 adapter->rx_mac_learn = true;
551 } else { 551 } else {
552 adapter->drv_mac_learn = 0; 552 adapter->drv_mac_learn = 0;
553 adapter->rx_mac_learn = 0; 553 adapter->rx_mac_learn = false;
554 } 554 }
555 555
556 qlcnic_nic_set_promisc(adapter, mode); 556 qlcnic_nic_set_promisc(adapter, mode);