← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/net/igb/igb_ethtool.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/igb/igb_ethtool.c
86
86
        IGB_STAT("tx_smbus", stats.mgptc),
87
87
        IGB_STAT("rx_smbus", stats.mgprc),
88
88
        IGB_STAT("dropped_smbus", stats.mgpdc),
 
89
        IGB_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),
 
90
        IGB_STAT("os2bmc_tx_by_bmc", stats.b2ospc),
 
91
        IGB_STAT("os2bmc_tx_by_host", stats.o2bspc),
 
92
        IGB_STAT("os2bmc_rx_by_host", stats.b2ogprc),
89
93
};
90
94
 
91
95
#define IGB_NETDEV_STAT(_net_stat) { \
603
607
        regs_buff[548] = rd32(E1000_TDFT);
604
608
        regs_buff[549] = rd32(E1000_TDFHS);
605
609
        regs_buff[550] = rd32(E1000_TDFPC);
606
 
 
 
610
        regs_buff[551] = adapter->stats.o2bgptc;
 
611
        regs_buff[552] = adapter->stats.b2ospc;
 
612
        regs_buff[553] = adapter->stats.o2bspc;
 
613
        regs_buff[554] = adapter->stats.b2ogprc;
607
614
}
608
615
 
609
616
static int igb_get_eeprom_len(struct net_device *netdev)
714
721
        /* Update the checksum over the first part of the EEPROM if needed
715
722
         * and flush shadow RAM for 82573 controllers */
716
723
        if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
717
 
                igb_update_nvm_checksum(hw);
 
724
                hw->nvm.ops.update(hw);
718
725
 
719
726
        kfree(eeprom_buff);
720
727
        return ret_val;
727
734
        char firmware_version[32];
728
735
        u16 eeprom_data;
729
736
 
730
 
        strncpy(drvinfo->driver,  igb_driver_name, 32);
731
 
        strncpy(drvinfo->version, igb_driver_version, 32);
 
737
        strncpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver) - 1);
 
738
        strncpy(drvinfo->version, igb_driver_version,
 
739
                sizeof(drvinfo->version) - 1);
732
740
 
733
741
        /* EEPROM image version # is reported as firmware version # for
734
742
         * 82575 controllers */
738
746
                (eeprom_data & 0x0FF0) >> 4,
739
747
                eeprom_data & 0x000F);
740
748
 
741
 
        strncpy(drvinfo->fw_version, firmware_version, 32);
742
 
        strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
 
749
        strncpy(drvinfo->fw_version, firmware_version,
 
750
                sizeof(drvinfo->fw_version) - 1);
 
751
        strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
 
752
                sizeof(drvinfo->bus_info) - 1);
743
753
        drvinfo->n_stats = IGB_STATS_LEN;
744
754
        drvinfo->testinfo_len = IGB_TEST_LEN;
745
755
        drvinfo->regdump_len = igb_get_regs_len(netdev);
1070
1080
                {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
1071
1081
        for (pat = 0; pat < ARRAY_SIZE(_test); pat++) {
1072
1082
                wr32(reg, (_test[pat] & write));
1073
 
                val = rd32(reg);
 
1083
                val = rd32(reg) & mask;
1074
1084
                if (val != (_test[pat] & write & mask)) {
1075
1085
                        dev_err(&adapter->pdev->dev, "pattern test reg %04X "
1076
1086
                                "failed: got 0x%08X expected 0x%08X\n",
1999
2009
        if ((adapter->flags & IGB_FLAG_QUEUE_PAIRS) && ec->tx_coalesce_usecs)
2000
2010
                return -EINVAL;
2001
2011
 
 
2012
        /* If ITR is disabled, disable DMAC */
 
2013
        if (ec->rx_coalesce_usecs == 0) {
 
2014
                if (adapter->flags & IGB_FLAG_DMAC)
 
2015
                        adapter->flags &= ~IGB_FLAG_DMAC;
 
2016
        }
 
2017
 
2002
2018
        /* convert to rate of irq's per second */
2003
2019
        if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3)
2004
2020
                adapter->rx_itr_setting = ec->rx_coalesce_usecs;