diff for duplicates of <1204853073.5541.36.camel@localhost> diff --git a/a/1.txt b/N1/1.txt index 5dfa952..94ffd91 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -107,7 +107,7 @@ index e8eb0fd..1c57ded 100644 @@ -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 @@ -166,7 +166,7 @@ index e8eb0fd..1c57ded 100644 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 { @@ -176,8 +176,8 @@ index e8eb0fd..1c57ded 100644 { 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]); } @@ -185,8 +185,8 @@ index e8eb0fd..1c57ded 100644 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]); @@ -194,8 +194,8 @@ index e8eb0fd..1c57ded 100644 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)); @@ -203,8 +203,8 @@ index e8eb0fd..1c57ded 100644 { 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); @@ -344,9 +344,9 @@ index 80a8b98..522172d 100644 /* 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); } @@ -400,7 +400,7 @@ index 80a8b98..522172d 100644 - 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)) { @@ -436,10 +436,10 @@ index 80a8b98..522172d 100644 + 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; @@ -460,7 +460,8 @@ index 80a8b98..522172d 100644 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; @@ -579,7 +580,7 @@ index 269e6f8..ae71dd1 100644 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; @@ -603,7 +604,7 @@ index 269e6f8..ae71dd1 100644 { 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 f1eb5e0..29d5c20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\047D032FA.9000909@intel.com\0" "From\0Joe Perches <joe@perches.com>\0" "Subject\0[PATCH] drivers/net/ixgb - convert boolean_t to bool\0" - "Date\0Fri, 07 Mar 2008 01:24:33 +0000\0" + "Date\0Thu, 06 Mar 2008 17:24:33 -0800\0" "To\0Kok" " Auke <auke-jan.h.kok@intel.com>\0" "Cc\0e1000-devel@lists.sourceforge.net" @@ -120,7 +120,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" @@ -179,7 +179,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" @@ -189,8 +189,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" @@ -198,8 +198,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" @@ -207,8 +207,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" @@ -216,8 +216,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" @@ -357,9 +357,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" @@ -413,7 +413,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" @@ -449,10 +449,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" @@ -473,7 +473,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" @@ -592,7 +593,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" @@ -616,7 +617,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" @@ -737,4 +738,4 @@ " #define ASSERT(x)\tif(!(x)) BUG()\n" " #define MSGOUT(S, A, B)\tprintk(KERN_DEBUG S \"\\n\", A, B)" -92ec96fe700c72134726bfed471c4254256b41976cf247594d100fb36ed52830 +b598faa9fb24ba036d44e99f47c9661431ec1f6f2c4743e5a302905c10bbce3f
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.