1. 03 6月, 2015 33 次提交
  2. 02 6月, 2015 7 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · dda922c8
      David S. Miller 提交于
      Conflicts:
      	drivers/net/phy/amd-xgbe-phy.c
      	drivers/net/wireless/iwlwifi/Kconfig
      	include/net/mac80211.h
      
      iwlwifi/Kconfig and mac80211.h were both trivial overlapping
      changes.
      
      The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
      the bug fix that happened on the 'net' side is already integrated
      into the rest of the amd-xgbe driver.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dda922c8
    • D
      Merge branch 'cxgb4-next' · db3397b9
      David S. Miller 提交于
      Hariprasad Shenai says:
      
      ====================
      cxgb4/cxgb4vf: Adds support for Chelsio T6 adapter
      
      This patch series adds the following:
      Adds NIC driver support for T6 adapter
      Adds vNIC driver support for T6 adapter
      
      This patch series has been created against net-next tree and includes
      patches on cxgb4 and cxgb4vf driver.
      
      We have included all the maintainers of respective drivers. Kindly review
      the change and let us know in case of any review comments.
      
      Thanks
      
      V2:
       Fixed compilation issue, when CHELSIO_T4_FCOE is set
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      db3397b9
    • H
      cxgb4vf: Adds SRIOV driver changes for T6 adapter · 41fc2e41
      Hariprasad Shenai 提交于
      Adds vnic driver register related changes for T6 adapter
      Signed-off-by: NHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      41fc2e41
    • H
      cxgb4: Adds support for T6 adapter · 3ccc6cf7
      Hariprasad Shenai 提交于
      Adds NIC driver related changes for T6 adapter. Register related
      changes, MC related changes, VF related changes, doorbell related
      changes, debugfs changes, etc
      Signed-off-by: NHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3ccc6cf7
    • H
      cxgb4: Add is_t6 macro and T6 register ranges · ab4b583b
      Hariprasad Shenai 提交于
      Adds new macro is_t6 and adds the register address range for T6 adapter
      Signed-off-by: NHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ab4b583b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c46a024e
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Various VTI tunnel (mark handling, PMTU) bug fixes from Alexander
          Duyck and Steffen Klassert.
      
       2) Revert ethtool PHY query change, it wasn't correct.  The PHY address
          selected by the driver running the PHY to MAC connection decides
          what PHY address GET ethtool operations return information from.
      
       3) Fix handling of sequence number bits for encryption IV generation in
          ESP driver, from Herbert Xu.
      
       4) UDP can return -EAGAIN when we hit a bad checksum on receive, even
          when there are other packets in the receive queue which is wrong.
          Just respect the error returned from the generic socket recv
          datagram helper.  From Eric Dumazet.
      
       5) Fix BNA driver firmware loading on big-endian systems, from Ivan
          Vecera.
      
       6) Fix regression in that we were inheriting the congestion control of
          the listening socket for new connections, the intended behavior
          always was to use the default in this case.  From Neal Cardwell.
      
       7) Fix NULL deref in brcmfmac driver, from Arend van Spriel.
      
       8) OTP parsing fix in iwlwifi from Liad Kaufman.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
        vti6: Add pmtu handling to vti6_xmit.
        Revert "net: core: 'ethtool' issue with querying phy settings"
        bnx2x: Move statistics implementation into semaphores
        xen: netback: read hotplug script once at start of day.
        xen: netback: fix printf format string warning
        Revert "netfilter: ensure number of counters is >0 in do_replace()"
        net: dsa: Properly propagate errors from dsa_switch_setup_one
        tcp: fix child sockets to use system default congestion control if not set
        udp: fix behavior of wrong checksums
        sfc: free multiple Rx buffers when required
        bna: fix soft lock-up during firmware initialization failure
        bna: remove unreasonable iocpf timer start
        bna: fix firmware loading on big-endian machines
        bridge: fix br_multicast_query_expired() bug
        via-rhine: Resigning as maintainer
        brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() fails
        mac80211: Fix mac80211.h docbook comments
        iwlwifi: nvm: fix otp parsing in 8000 hw family
        iwlwifi: pcie: fix tracking of cmd_in_flight
        ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
        ...
      c46a024e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 2459c609
      Linus Torvalds 提交于
      Pull Sparc fixes from David Miller:
      
       1) Setup the core/threads/sockets bitmaps correctly so that 'lscpus'
          and friends operate properly.  Frtom Chris Hyser.
      
       2) The bit that normally means "Cached Virtually" on sun4v systems,
          actually changes meaning in M7 and later chips.  Fix from Khalid
          Aziz.
      
       3) One some PCI-E systems we need to probe different OF properties to
          fill in the PCI slot information properly, from Eric Snowberg.
      
       4) Kill an extraneous memset after kzalloc(), from Christophe Jaillet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE
        sparc64: pci slots information is not populated in sysfs
        sparc: kernel: GRPCI2: Remove a useless memset
        sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly
      2459c609