diff for duplicates of <47D17804.4050004@intel.com> diff --git a/a/1.txt b/N1/1.txt index 7288c2f..8df5823 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -117,7 +117,7 @@ Auke > @@ -332,9 +332,9 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw) > checksum += ixgb_read_eeprom(hw, i); > -> if(checksum = (uint16_t) EEPROM_SUM) +> if(checksum == (uint16_t) EEPROM_SUM) > - return (TRUE); > + return (true); > else @@ -176,7 +176,7 @@ Auke > struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; > > if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) -> = cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { +> == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { > - return (TRUE); > + return (true); > } else { @@ -186,8 +186,8 @@ Auke > { > > if ((index < IXGB_EEPROM_SIZE) && -> - (ixgb_check_and_get_eeprom_data(hw) = TRUE)) { -> + (ixgb_check_and_get_eeprom_data(hw) = true)) { +> - (ixgb_check_and_get_eeprom_data(hw) == TRUE)) { +> + (ixgb_check_and_get_eeprom_data(hw) == true)) { > return(hw->eeprom[index]); > } > @@ -195,8 +195,8 @@ Auke > > DEBUGFUNC("ixgb_get_ee_mac_addr"); > -> - if (ixgb_check_and_get_eeprom_data(hw) = TRUE) { -> + if (ixgb_check_and_get_eeprom_data(hw) = true) { +> - if (ixgb_check_and_get_eeprom_data(hw) == TRUE) { +> + if (ixgb_check_and_get_eeprom_data(hw) == true) { > for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) { > mac_addr[i] = ee_map->mac_addr[i]; > DEBUGOUT2("mac(%d) = %.2X\n", i, mac_addr[i]); @@ -204,8 +204,8 @@ Auke > uint32_t > ixgb_get_ee_pba_number(struct ixgb_hw *hw) > { -> - if(ixgb_check_and_get_eeprom_data(hw) = TRUE) -> + if(ixgb_check_and_get_eeprom_data(hw) = true) +> - if(ixgb_check_and_get_eeprom_data(hw) == TRUE) +> + if(ixgb_check_and_get_eeprom_data(hw) == true) > return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) > | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16)); > @@ -213,8 +213,8 @@ Auke > { > struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; > -> - if(ixgb_check_and_get_eeprom_data(hw) = TRUE) -> + if(ixgb_check_and_get_eeprom_data(hw) = true) +> - if(ixgb_check_and_get_eeprom_data(hw) == TRUE) +> + if(ixgb_check_and_get_eeprom_data(hw) == true) > return (le16_to_cpu(ee_map->device_id)); > > return (0); @@ -354,9 +354,9 @@ Auke > /* Delay a few ms just to allow the reset to complete */ > msleep(IXGB_DELAY_AFTER_EE_RESET); > -> - if (ixgb_get_eeprom_data(hw) = FALSE) { +> - if (ixgb_get_eeprom_data(hw) == FALSE) { > - return(FALSE); -> + if (ixgb_get_eeprom_data(hw) = false) { +> + if (ixgb_get_eeprom_data(hw) == false) { > + return(false); > } > @@ -410,7 +410,7 @@ Auke > - boolean_t bad_link_returncode = FALSE; > + bool bad_link_returncode = false; > -> if (hw->phy_type = ixgb_phy_type_txn17401) { +> if (hw->phy_type == ixgb_phy_type_txn17401) { > newLFC = IXGB_READ_REG(hw, LFC); > @@ -986,7 +986,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw) > || (hw->lastRFC + 250 < newRFC)) { @@ -446,10 +446,10 @@ Auke > + is_valid = false; > } > /* Reject the zero address */ -> else if (mac_addr[0] = 0 && +> else if (mac_addr[0] == 0 && > @@ -1179,7 +1179,7 @@ mac_addr_valid(uint8_t *mac_addr) -> mac_addr[4] = 0 && -> mac_addr[5] = 0) { +> mac_addr[4] == 0 && +> mac_addr[5] == 0) { > DEBUGOUT("MAC address is all zeros\n"); > - is_valid = FALSE; > + is_valid = false; @@ -470,7 +470,8 @@ Auke > uint8_t lrst_retries = MAX_RESET_ITERATIONS; > > @@ -1208,7 +1208,7 @@ ixgb_link_reset(struct ixgb_hw *hw) -> link_status > ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU) +> link_status = +> ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU) > && (IXGB_READ_REG(hw, XPCSS) & > - IXGB_XPCSS_ALIGN_STATUS)) ? TRUE : FALSE; > + IXGB_XPCSS_ALIGN_STATUS)) ? true : false; @@ -589,7 +590,7 @@ Auke > IXGB_WRITE_REG(hw, RXDCTL, rxdctl); > > /* Enable Receive Checksum Offload for TCP and UDP */ -> - if(adapter->rx_csum = TRUE) { +> - if(adapter->rx_csum == TRUE) { > + if(adapter->rx_csum) { > rxcsum = IXGB_READ_REG(hw, RXCSUM); > rxcsum |= IXGB_RXCSUM_TUOFL; @@ -613,7 +614,7 @@ Auke > { > struct ixgb_context_desc *context_desc; > @@ -1275,10 +1275,10 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb) -> if(++i = adapter->tx_ring.count) i = 0; +> if(++i == adapter->tx_ring.count) i = 0; > adapter->tx_ring.next_to_use = i; > > - return TRUE; diff --git a/a/content_digest b/N1/content_digest index 71c23d3..ed5407e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\01204853073.5541.36.camel@localhost\0" "From\0Kok, Auke <auke-jan.h.kok@intel.com>\0" "Subject\0Re: [PATCH] drivers/net/ixgb - convert boolean_t to bool\0" - "Date\0Fri, 07 Mar 2008 17:14:44 +0000\0" + "Date\0Fri, 07 Mar 2008 09:14:44 -0800\0" "To\0Joe Perches <joe@perches.com>\0" "Cc\0Kok" Auke <auke-jan.h.kok@intel.com> @@ -132,7 +132,7 @@ "> @@ -332,9 +332,9 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)\n" "> \t\tchecksum += ixgb_read_eeprom(hw, i);\n" "> \n" - "> \tif(checksum = (uint16_t) EEPROM_SUM)\n" + "> \tif(checksum == (uint16_t) EEPROM_SUM)\n" "> -\t\treturn (TRUE);\n" "> +\t\treturn (true);\n" "> \telse\n" @@ -191,7 +191,7 @@ "> \tstruct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;\n" "> \n" "> \tif ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))\n" - "> \t = cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {\n" + "> \t == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {\n" "> -\t\treturn (TRUE);\n" "> +\t\treturn (true);\n" "> \t} else {\n" @@ -201,8 +201,8 @@ "> {\n" "> \n" "> \tif ((index < IXGB_EEPROM_SIZE) &&\n" - "> -\t\t(ixgb_check_and_get_eeprom_data(hw) = TRUE)) {\n" - "> +\t\t(ixgb_check_and_get_eeprom_data(hw) = true)) {\n" + "> -\t\t(ixgb_check_and_get_eeprom_data(hw) == TRUE)) {\n" + "> +\t\t(ixgb_check_and_get_eeprom_data(hw) == true)) {\n" "> \t return(hw->eeprom[index]);\n" "> \t}\n" "> \n" @@ -210,8 +210,8 @@ "> \n" "> \tDEBUGFUNC(\"ixgb_get_ee_mac_addr\");\n" "> \n" - "> -\tif (ixgb_check_and_get_eeprom_data(hw) = TRUE) {\n" - "> +\tif (ixgb_check_and_get_eeprom_data(hw) = true) {\n" + "> -\tif (ixgb_check_and_get_eeprom_data(hw) == TRUE) {\n" + "> +\tif (ixgb_check_and_get_eeprom_data(hw) == true) {\n" "> \t\tfor (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) {\n" "> \t\t\tmac_addr[i] = ee_map->mac_addr[i];\n" "> \t\t\tDEBUGOUT2(\"mac(%d) = %.2X\\n\", i, mac_addr[i]);\n" @@ -219,8 +219,8 @@ "> uint32_t\n" "> ixgb_get_ee_pba_number(struct ixgb_hw *hw)\n" "> {\n" - "> -\tif(ixgb_check_and_get_eeprom_data(hw) = TRUE)\n" - "> +\tif(ixgb_check_and_get_eeprom_data(hw) = true)\n" + "> -\tif(ixgb_check_and_get_eeprom_data(hw) == TRUE)\n" + "> +\tif(ixgb_check_and_get_eeprom_data(hw) == true)\n" "> \t\treturn (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])\n" "> \t\t\t| (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16));\n" "> \n" @@ -228,8 +228,8 @@ "> {\n" "> \tstruct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;\n" "> \n" - "> -\tif(ixgb_check_and_get_eeprom_data(hw) = TRUE)\n" - "> +\tif(ixgb_check_and_get_eeprom_data(hw) = true)\n" + "> -\tif(ixgb_check_and_get_eeprom_data(hw) == TRUE)\n" + "> +\tif(ixgb_check_and_get_eeprom_data(hw) == true)\n" "> \t\treturn (le16_to_cpu(ee_map->device_id));\n" "> \n" "> \treturn (0);\n" @@ -369,9 +369,9 @@ "> \t/* Delay a few ms just to allow the reset to complete */\n" "> \tmsleep(IXGB_DELAY_AFTER_EE_RESET);\n" "> \n" - "> -\tif (ixgb_get_eeprom_data(hw) = FALSE) {\n" + "> -\tif (ixgb_get_eeprom_data(hw) == FALSE) {\n" "> -\t\treturn(FALSE);\n" - "> +\tif (ixgb_get_eeprom_data(hw) = false) {\n" + "> +\tif (ixgb_get_eeprom_data(hw) == false) {\n" "> +\t\treturn(false);\n" "> \t}\n" "> \n" @@ -425,7 +425,7 @@ "> -\tboolean_t bad_link_returncode = FALSE;\n" "> +\tbool bad_link_returncode = false;\n" "> \n" - "> \tif (hw->phy_type = ixgb_phy_type_txn17401) {\n" + "> \tif (hw->phy_type == ixgb_phy_type_txn17401) {\n" "> \t\tnewLFC = IXGB_READ_REG(hw, LFC);\n" "> @@ -986,7 +986,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)\n" "> \t\t || (hw->lastRFC + 250 < newRFC)) {\n" @@ -461,10 +461,10 @@ "> +\t\tis_valid = false;\n" "> \t}\n" "> \t/* Reject the zero address */\n" - "> \telse if (mac_addr[0] = 0 &&\n" + "> \telse if (mac_addr[0] == 0 &&\n" "> @@ -1179,7 +1179,7 @@ mac_addr_valid(uint8_t *mac_addr)\n" - "> \t\t\t mac_addr[4] = 0 &&\n" - "> \t\t\t mac_addr[5] = 0) {\n" + "> \t\t\t mac_addr[4] == 0 &&\n" + "> \t\t\t mac_addr[5] == 0) {\n" "> \t\tDEBUGOUT(\"MAC address is all zeros\\n\");\n" "> -\t\tis_valid = FALSE;\n" "> +\t\tis_valid = false;\n" @@ -485,7 +485,8 @@ "> \tuint8_t lrst_retries = MAX_RESET_ITERATIONS;\n" "> \n" "> @@ -1208,7 +1208,7 @@ ixgb_link_reset(struct ixgb_hw *hw)\n" - "> \t\t\tlink_status > \t\t\t ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)\n" + "> \t\t\tlink_status =\n" + "> \t\t\t ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)\n" "> \t\t\t && (IXGB_READ_REG(hw, XPCSS) &\n" "> -\t\t\t\t IXGB_XPCSS_ALIGN_STATUS)) ? TRUE : FALSE;\n" "> +\t\t\t\t IXGB_XPCSS_ALIGN_STATUS)) ? true : false;\n" @@ -604,7 +605,7 @@ "> \tIXGB_WRITE_REG(hw, RXDCTL, rxdctl);\n" "> \n" "> \t/* Enable Receive Checksum Offload for TCP and UDP */\n" - "> -\tif(adapter->rx_csum = TRUE) {\n" + "> -\tif(adapter->rx_csum == TRUE) {\n" "> +\tif(adapter->rx_csum) {\n" "> \t\trxcsum = IXGB_READ_REG(hw, RXCSUM);\n" "> \t\trxcsum |= IXGB_RXCSUM_TUOFL;\n" @@ -628,7 +629,7 @@ "> {\n" "> \tstruct ixgb_context_desc *context_desc;\n" "> @@ -1275,10 +1275,10 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)\n" - "> \t\tif(++i = adapter->tx_ring.count) i = 0;\n" + "> \t\tif(++i == adapter->tx_ring.count) i = 0;\n" "> \t\tadapter->tx_ring.next_to_use = i;\n" "> \n" "> -\t\treturn TRUE;\n" @@ -756,4 +757,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > Please read the FAQ at http://www.tux.org/lkml/ -943d1ab9433d1ba24e0bdccaec5c66784fed72be977e71cdb29bc2c9bba64456 +dbe77a7fd64eab4749eca02eb1bba2a9adc658579149d20aead54d2964a30a75
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.