← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-ti-omap4/quantal

« back to all changes in this revision

Viewing changes to drivers/net/wireless/ath/ath9k/ar5008_phy.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.2.0-19.31, Ubuntu: 3.2.0-19.30
  • Date: 2012-03-21 15:23:51 UTC
  • Revision ID: package-import@ubuntu.com-20120321152351-ya52awpl9cmqlwrs
Tags: 3.2.0-1410.13
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/598251
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/959959
https://launchpad.net/bugs/499557
https://launchpad.net/bugs/952035
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/872044
https://launchpad.net/bugs/917842
https://launchpad.net/bugs/917842
[ Paolo Pisati ]

* rebased on Ubuntu-3.2.0-19.31

[ Ubuntu: 3.2.0-19.31 ]

* d-i: Add dm-multipath and scsi device handlers
  - LP: #959749
* d-i: Move multipath modules into their own udeb
  - LP: #598251, #959749
* [Config] Auto-detect do_tools setting
* [Config] correctly specify CROSS_COMPILE for tools build
* [Config] CONFIG_DRM_PSB_CDV=n
* Rebase to v3.2.12
* powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
  - LP: #959959
* rebase to v3.2.12

[ Ubuntu: 3.2.0-19.30 ]

* [Config] Fix typeo in the Hyper-V module names
* [Config] Move kernels to "Section: kernel"
  - LP: #499557
* SAUCE: AppArmor: Add ability to load extended policy
* SAUCE: AppArmor: Add the ability to mediate mount
* SAUCE: AppArmor: Add profile introspection file to interface
* SAUCE: AppArmor: basic networking rules
* [Config] Disable CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
  - LP: #952035
* Rebase to v3.2.10
* [Config] Update configs after rebase to v3.2.10
* Rebase to v3.2.11
* [Config] Disable CONFIG_STUB_POULSBO
  - LP: #899244
* [Config] Add CONFIG_DRM_PSB check to enforcer
  - LP: #899244
* [Config] Drop non-SMP powerpc
* net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
* x86: Derandom delay_tsc for 64 bit
* Bluetooth: Fix l2cap conn failures for ssp devices
  - LP: #872044
* KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
  - LP: #917842
  - CVE-2012-0045
* KVM: x86: fix missing checks in syscall emulation
  - LP: #917842
  - CVE-2012-0045
* rebase to v3.2.11
* rebase to v3.2.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/ath/ath9k/ar5008_phy.c
489
489
        ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
490
490
        ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
491
491
        ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
492
 
        ATH_ALLOC_BANK(ah->addac5416_21,
493
 
                       ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);
494
492
        ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
495
493
 
496
494
        return 0;
519
517
        ATH_FREE_BANK(ah->analogBank6Data);
520
518
        ATH_FREE_BANK(ah->analogBank6TPCData);
521
519
        ATH_FREE_BANK(ah->analogBank7Data);
522
 
        ATH_FREE_BANK(ah->addac5416_21);
523
520
        ATH_FREE_BANK(ah->bank6Temp);
524
521
 
525
522
#undef ATH_FREE_BANK
805
802
        if (ah->eep_ops->set_addac)
806
803
                ah->eep_ops->set_addac(ah, chan);
807
804
 
808
 
        if (AR_SREV_5416_22_OR_LATER(ah)) {
809
 
                REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
810
 
        } else {
811
 
                struct ar5416IniArray temp;
812
 
                u32 addacSize =
813
 
                        sizeof(u32) * ah->iniAddac.ia_rows *
814
 
                        ah->iniAddac.ia_columns;
815
 
 
816
 
                /* For AR5416 2.0/2.1 */
817
 
                memcpy(ah->addac5416_21,
818
 
                       ah->iniAddac.ia_array, addacSize);
819
 
 
820
 
                /* override CLKDRV value at [row, column] = [31, 1] */
821
 
                (ah->addac5416_21)[31 * ah->iniAddac.ia_columns + 1] = 0;
822
 
 
823
 
                temp.ia_array = ah->addac5416_21;
824
 
                temp.ia_columns = ah->iniAddac.ia_columns;
825
 
                temp.ia_rows = ah->iniAddac.ia_rows;
826
 
                REG_WRITE_ARRAY(&temp, 1, regWrites);
827
 
        }
828
 
 
 
805
        REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);
829
806
        REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_INTERNAL_ADDAC);
830
807
 
831
808
        ENABLE_REGWRITE_BUFFER(ah);