1. 03 6月, 2015 20 次提交
  2. 02 6月, 2015 20 次提交
    • 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
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · fec345ba
      Linus Torvalds 提交于
      Pull virtio fix from Michael Tsirkin:
       "Last-minute virtio fix for 4.1
      
        This tweaks an exported user-space header to fix build breakage for
        userspace using it"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h
      fec345ba
    • J
    • J
    • D
      Merge branch 'rocker-next' · ff43c28a
      David S. Miller 提交于
      Scott Feldman says:
      
      ====================
      rocker: enable by default untagged VLAN support
      
      This patch set is a followup to Simon Horman's RFC patch:
      
         [PATCH/RFC net-next] rocker: by default accept untagged packets
      
      Now, on port probe, we install untagged VLAN (vid=0) support for each port
      as the default.  This is equivalent to the command:
      
         bridge vlan add vid 0 dev DEV self
      
      Accepting untagged VLAN pkts is a reasonable default, but the user could
      override this with:
      
         bridge vlan del vid 0 dev DEV self
      
      With this, we no longer need 8021q module to install vid=0 when port interface
      opens.  In fact, we don't need support for legacy VLAN ndo ops at all since
      they're superseded by bridge_setlink/dellink.  So remove legacy VLAN ndo ops
      support in driver.  (The legacy VLAN ndo ops are supported by bonding/team
      drivers, but don't fit into the transaction model offered by switchdev, so
      switching all VLAN functions to bridge_setlink/dellink switchdev support gets
      us stacked driver + transaction model support).
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff43c28a
    • S
      rocker: remove support for legacy VLAN ndo ops · 2aa2ed08
      Scott Feldman 提交于
      Remove support for legacy ndo ops
      .ndo_vlan_rx_add_vid/.ndo_vlan_rx_kill_vid.  Rocker will use
      bridge_setlink/dellink exclusively for VLAN add/del operations.
      
      The legacy ops are needed if using 8021q driver module to setup VLANs on
      the port.  But an alternative exists in using bridge_setlink/delink to
      setup VLANs, which doesn't depend on 8021q module.  So rocker will switch
      to the newer setlink/dellink ops.  VLANs can added/delete from the port,
      regardless if port is bridged or not, using the bridge commands:
      
      	bridge vlan [add|del] vid VID dev DEV self
      
      (Yes, I agree it's confusing to use the "bridge" command to set a VLAN on a
      non-bridged port).
      
      Using setlink/dellink over legacy ops let's us handle the stacked driver
      case automatically.  It's built-in.  setlink also pass additional flags
      (PVID, egress untagged) that aren't available with the legacy ops.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2aa2ed08
    • S
      rocker: install/remove router MAC for untagged VLAN when joining/leaving bridge · 027e00dc
      Scott Feldman 提交于
      When the port joins a bridge, the port's internal VLAN ID needs to change
      to the bridge's internal VLAN ID.  Likewise, when leaving the bridge, the
      internal VLAN ID reverts back the port's original internal VLAN ID.  (The
      internal VLAN ID is used by device to internally mark untagged pkts with
      some VLAN, which will eventually be removed on egress...think PVID).  When
      the internal VLAN ID changes, we need to update the VLAN table entries and
      the router MAC entries for IP/IPv6 to reflect the new internal VLAN ID.
      
      This patch makes use of the common rocker_port_vlan_add/del functions to
      make sure the tables are updated for the current internal VLAN ID.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      027e00dc
    • S
      rocker: install untagged VLAN (vid=0) support for each port · bcfd7801
      Scott Feldman 提交于
      On port probe, install by default untagged VLAN support.  This is
      equivalent to running the command:
      
      	bridge vlan add vid 0 dev DEV self
      
      A user could, if they wanted, manaully removing untagged support from the
      port by running the command:
      
      	bridge vlan del vid 0 dev DEV self
      
      But installing it by default on port initialization gives the normal
      expected behavior.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bcfd7801
    • S
      rocker: cleanup vlan table on error adding vlan · cec04a60
      Scott Feldman 提交于
      Basic house keeping: If there is an error adding the router MAC for this
      vlan, removing the just installed VLAN table entry to leave device in same
      state as before failure.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cec04a60
    • S
      rocker: zero allocate ports array · 27b808cb
      Scott Feldman 提交于
      When allocating the array of rocker port pointers, zero the array values so
      we can test for !NULL to see if port is allocated/registered.  We'll need
      this later when installing untagged VLAN support for each port, during port
      probe.  It's a long story, but to install a VLAN (vid=0 for untagged, in
      this case) on a port, we'll need to scan other ports to see if the VLAN
      group for that VLAN has been setup.  To scan the other ports, we need to
      walk the port array.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      27b808cb
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · e453581d
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fix for net
      
      The following patch reverts the ebtables chunk that enforces counters that was
      introduced in the recently applied d26e2c9f ('Revert "netfilter: ensure
      number of counters is >0 in do_replace()"') since this breaks ebtables.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e453581d
    • T
      vlan: Add GRO support for non hardware accelerated vlan · 66e5133f
      Toshiaki Makita 提交于
      Currently packets with non-hardware-accelerated vlan cannot be handled
      by GRO. This causes low performance for 802.1ad and stacked vlan, as their
      vlan tags are currently not stripped by hardware.
      
      This patch adds GRO support for non-hardware-accelerated vlan and
      improves receive performance of them.
      
      Test Environment:
       vlan device (.1Q) on vlan device (.1ad) on ixgbe (82599)
      
      Result:
      
      - Before
      
      $ netperf -t TCP_STREAM -H 192.168.20.2 -l 60
      Recv   Send    Send
      Socket Socket  Message  Elapsed
      Size   Size    Size     Time     Throughput
      bytes  bytes   bytes    secs.    10^6bits/sec
      
       87380  16384  16384    60.00    5233.17
      
      Rx side CPU usage:
        %usr      %sys      %irq     %soft     %idle
        0.27     58.03      0.00     41.70      0.00
      
      - After
      
      $ netperf -t TCP_STREAM -H 192.168.20.2 -l 60
      Recv   Send    Send
      Socket Socket  Message  Elapsed
      Size   Size    Size     Time     Throughput
      bytes  bytes   bytes    secs.    10^6bits/sec
      
       87380  16384  16384    60.00    7586.85
      
      Rx side CPU usage:
        %usr      %sys      %irq     %soft     %idle
        0.50     25.83      0.00     59.53     14.14
      
      [ Register VLAN offloads with priority 10 -DaveM ]
      Signed-off-by: NToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      66e5133f
    • H
      cxgb4: remove unused fn to enable/disable db coalescing · 661b689b
      Hariprasad Shenai 提交于
      Remove unused function cxgb4_enable_db_coalescing() and
      cxgb4_disable_db_coalescing()
      Signed-off-by: NHariprasad Shenai <hariprasad@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      661b689b
    • D
      Merge tag 'wireless-drivers-for-davem-2015-06-01' of... · cd842a67
      David S. Miller 提交于
      Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
      
      Kalle Valo says:
      
      ====================
      iwlwifi:
      
      * fix OTP parsing 8260
      * fix powersave handling for 8260
      
      brcmfmac:
      
      * fix null pointer crash
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cd842a67