← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
708
708
{
709
709
        struct ixgbe_hw *hw = &adapter->hw;
710
710
        u32 incval = 0;
 
711
        u32 timinca = 0;
711
712
        u32 shift = 0;
712
713
        u32 cycle_speed;
713
714
        unsigned long flags;
730
731
                break;
731
732
        }
732
733
 
733
 
        /* Bail if the cycle speed didn't change */
734
 
        if (adapter->cycle_speed == cycle_speed)
 
734
        /*
 
735
         * grab the current TIMINCA value from the register so that it can be
 
736
         * double checked. If the register value has been cleared, it must be
 
737
         * reset to the correct value for generating a cyclecounter. If
 
738
         * TIMINCA is zero, the SYSTIME registers do not increment at all.
 
739
         */
 
740
        timinca = IXGBE_READ_REG(hw, IXGBE_TIMINCA);
 
741
 
 
742
        /* Bail if the cycle speed didn't change and TIMINCA is non-zero */
 
743
        if (adapter->cycle_speed == cycle_speed && timinca)
735
744
                return;
736
745
 
737
746
        /* disable the SDP clock out */