1. 23 Oct, 2012 14 commits
  2. 22 Oct, 2012 23 commits
  3. 20 Oct, 2012 1 commit
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 72ec301a
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      This series contains updates to ixgbe and igb.
      
      Alexander Duyck (13):
        ixgbe: Initialize q_vector cpu and affinity masks correctly
        ixgbe: Enable jumbo frames support w/ SR-IOV
        ixgbe: Move message handling routines into their own functions
        ixgbe: Add mailbox API version negotiation support to ixgbe PF
        igb: Split Rx timestamping into two separate functions
        igb: Do not use header split, instead receive all frames into a
          single buffer
        igb: Combine post-processing of skb into a single function
        igb: Map entire page and sync half instead of mapping and unmapping
          half pages
        igb: Move rx_buffer related code in Rx cleanup path into separate
          function
        igb: Lock buffer size at 2K even on systems with larger pages
        igb: Combine q_vector and ring allocation into a single function
        igb: Move the calls to set the Tx and Rx queues into igb_open
        igb: Split igb_update_dca into separate Tx and Rx functions
      
      Tushar Dave (1):
        igb: Correcting and improving small packet check and padding
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      72ec301a
  4. 19 Oct, 2012 2 commits
    • David S. Miller's avatar
      Merge branch 'at91' · 1b6f0f92
      David S. Miller authored
      Joachim Eastwood says;
      
      ====================
      This patch series prepares the old at91_ether driver for code sharing
      with the macb driver. The hardware is similar except for DMA TX/RX, so
      its not quite clear if it is practical to support both in one
      driver. But stuff like MDIO and statistics should be possible to
      share.
      
      Patch 1 adds some register defines and bits that is only found on
      RM9200.
      
      Patch 2-4 uses the register defines and access functions from the macb
      header. These can be squashed if it cause too much churn.
      
      Patch 5 merges the private at91_ether struct with the private macb
      struct. This makes it easier to later share code with the macb. The
      private macb struct becomes quite large, but most at91_ether specific
      members are removed in later patches.
      
      Patch 8 make macb compile when we select at91_ether. Is this approach
      okey?
      
      Patch 9 makes use of MDIO code from macb. This rips out the private
      phy handling code in at91_ether. One thing that is lost is the
      interrupt support for phy. But this should easy to add to macb which
      will then benefit both drivers.
      
      Patch 10 makes use of the macb_set_rx_mode from macb.
      
      Patch 11-12 makes at91_ether share the rx dma struct members from
      macb. Patch also moves the rx buffer allocation into netdev open and
      dealloc into netdev close.
      
      Last patch remove the now unused rm9200 emac header from include/mach.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1b6f0f92
    • Joachim Eastwood's avatar
      ARM: AT91: remove old RM9200 EMAC register definitions · 4fa7fc10
      Joachim Eastwood authored
      This file is unused after at91_ether was converted to use macb.h
      Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
      4fa7fc10