1. 05 2月, 2013 32 次提交
  2. 04 2月, 2013 1 次提交
  3. 03 2月, 2013 4 次提交
    • D
      Merge branch 'delete-wanrouter' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 33397a71
      David S. Miller 提交于
      Paul Gortmaker says:
      
      ====================
      The removal of wanrouter code was originally listed in the (now
      gone) feature removal file since May 2012, and an RFC of the
      deletion was posted[1] in late 2012.  The overall concept was given
      an OK, but defconfig contamination, build failures, etc. meant that
      it didn't quite make it into mainline for 3.8.
      
      Since that time, Dan discovered (via code audit) a runtime bug that
      proves nobody has been using this for over four years[2].  With that
      new information, I think it makes sense for someone to follow through
      on Joe's original RFC and get this done for the 3.9 release.
      
      In addition to resolving the build failures of the RFC by keeping
      stub headers, this also splits the change into two parts, just like
      the token ring removal did.  Part #1 decouples the mainline kernel
      from the expired subsystem, and part #2 does the large scale
      deletion of the subsystem content.
      
      The advantage of the above, is that a "git blame" will never lead
      you to a 4000+ line deletion commit.  The large scale deletion will
      never show up in a "git blame" and hence the same advantages that we
      get from the "--irreversible-delete" in the review stage of "git
      format-patch" are also embedded into the git history itself.  This
      may seem like a moot point to some, but for those who spend a
      considerable amount of time data mining in the git history, this is
      probably worth doing.
      
      I have done build tests of all[mod/yes]config for both the stage 1
      (Makefile and Kconfig) and stage 2 (full driver delete) as a sanity
      check, and the issues with the previously posted RFC should be gone.
      
      Speaking of "--irreversible-delete" -- these patches were created
      with that option, so if you want to use them locally, you are going
      to have to pull (location below) the content instead of doing a
      "git am" of the mailed out content.
      
      [1] http://patchwork.ozlabs.org/patch/198794/
      [2] http://www.spinics.net/lists/netdev/msg218670.html
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      33397a71
    • D
      qlcnic: silence false positive overflow warning · 7bc48646
      Dan Carpenter 提交于
      We actually store the MAC address as well as the board_name here.  The
      longest board_name is 75 characters so there is more than enough room
      to hold the 17 character MAC and the ": " divider.  But making this
      buffer larger silences a static checker warning.
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Acked-By: NJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7bc48646
    • M
      bnx2x: Force link UP when the interface is in LOOPBACK mode · 7614fe88
      Mahesh Bandewar 提交于
      When the interface does not have carrier but when it's put into
      loopback mode (for tests), it does not make sense to not have
      the carrier. So force it!
      Signed-off-by: NMahesh Bandewar <maheshb@google.com>
      Acked-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7614fe88
    • D
      Merge branch 'intel' · daef2262
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      This series contains updates to ixgbe and e1000e.  The ixgbe patches are
      a mix of fixes, cleanup and added functionality.  The first fix is for
      traffic classes, where if the mapping has changed reset the NIC.  The other
      ixgbe fix resolves an issue where the device lookup neglected to do a
      pci_dev_put() to decrement the device reference count.
      
      The ixgbe cleanup was done by Josh, where the auto-negotiation variables
      were renamed/cleaned up and refactored.
      
      The remaining patches are from Bruce to do additional cleanup on e1000e as
      well as bump the driver version.  Most notably is the cleanup to use the
      kernel IEEE MII definitions where possible instead of the local MII
      definitions.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      daef2262
  4. 01 2月, 2013 3 次提交