ath5k: Use high bitrates for ACK/CTS

[~andy/linux] / drivers / net / tg3.c

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f204f73c4f99cb0edc0a7939c67ae365b6c1a8a8..0fa7688ab483fb729c22fbc1f0a1fa54d05b1261 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9458,15 +9458,12 @@ static void __tg3_set_rx_mode(struct net_device *dev)
        } else {
                /* Accept one or more multicast(s). */
                struct dev_mc_list *mclist;
-               unsigned int i;
                u32 mc_filter[4] = { 0, };
                u32 regidx;
                u32 bit;
                u32 crc;
 
-               for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
-                    i++, mclist = mclist->next) {
-
+               netdev_for_each_mc_addr(mclist, dev) {
                        crc = calc_crc (mclist->dmi_addr, ETH_ALEN);
                        bit = ~crc & 0x7f;
                        regidx = (bit & 0x60) >> 5;
@@ -12550,7 +12547,8 @@ skip_phy_reset:
 static void __devinit tg3_read_partno(struct tg3 *tp)
 {
        unsigned char vpd_data[TG3_NVM_VPD_LEN];   /* in little-endian format */
-       unsigned int i;
+       unsigned int block_end, rosize, len;
+       int i = 0;
        u32 magic;
 
        if ((tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) ||
@@ -12572,7 +12570,7 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
                }
        } else {
                ssize_t cnt;
-               unsigned int pos = 0, i = 0;
+               unsigned int pos = 0;
 
                for (; pos < TG3_NVM_VPD_LEN && i < 3; i++, pos += cnt) {
                        cnt = pci_read_vpd(tp->pdev, pos,
@@ -12587,51 +12585,33 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
                        goto out_not_found;
        }
 
-       /* Now parse and find the part number. */
-       for (i = 0; i < TG3_NVM_VPD_LEN - 2; ) {
-               unsigned char val = vpd_data[i];
-               unsigned int block_end;
-
-               if (val == 0x82 || val == 0x91) {
-                       i = (i + 3 +
-                            (vpd_data[i + 1] +
-                             (vpd_data[i + 2] << 8)));
-                       continue;
-               }
-
-               if (val != 0x90)
-                       goto out_not_found;
+       i = pci_vpd_find_tag(vpd_data, 0, TG3_NVM_VPD_LEN,
+                            PCI_VPD_LRDT_RO_DATA);
+       if (i < 0)
+               goto out_not_found;
 
-               block_end = (i + 3 +
-                            (vpd_data[i + 1] +
-                             (vpd_data[i + 2] << 8)));
-               i += 3;
+       rosize = pci_vpd_lrdt_size(&vpd_data[i]);
+       block_end = i + PCI_VPD_LRDT_TAG_SIZE + rosize;
+       i += PCI_VPD_LRDT_TAG_SIZE;
 
-               if (block_end > TG3_NVM_VPD_LEN)
-                       goto out_not_found;
+       if (block_end > TG3_NVM_VPD_LEN)
+               goto out_not_found;
 
-               while (i < (block_end - 2)) {
-                       if (vpd_data[i + 0] == 'P' &&
-                           vpd_data[i + 1] == 'N') {
-                               int partno_len = vpd_data[i + 2];
+       i = pci_vpd_find_info_keyword(vpd_data, i, rosize,
+                                     PCI_VPD_RO_KEYWORD_PARTNO);
+       if (i < 0)
+               goto out_not_found;
 
-                               i += 3;
-                               if (partno_len > TG3_BPN_SIZE ||
-                                   (partno_len + i) > TG3_NVM_VPD_LEN)
-                                       goto out_not_found;
+       len = pci_vpd_info_field_size(&vpd_data[i]);
 
-                               memcpy(tp->board_part_number,
-                                      &vpd_data[i], partno_len);
+       i += PCI_VPD_INFO_FLD_HDR_SIZE;
+       if (len > TG3_BPN_SIZE ||
+           (len + i) > TG3_NVM_VPD_LEN)
+               goto out_not_found;
 
-                               /* Success. */
-                               return;
-                       }
-                       i += 3 + vpd_data[i + 2];
-               }
+       memcpy(tp->board_part_number, &vpd_data[i], len);
 
-               /* Part number not found. */
-               goto out_not_found;
-       }
+       return;
 
 out_not_found:
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)