1. 14 3月, 2016 33 次提交
    • D
      Merge branch 'ipv4-ipv6-csums' · 20db778e
      David S. Miller 提交于
      Alexander Duyck says:
      
      ====================
      Fix differences between IPv4 and IPv6 TCP/UDP checksum calculation
      
      This patch series is meant to address the differences that exist between
      IPv4 and IPv6 in terms of checksum calculation.  Specifically the IPv6
      function csum_ipv6_magic treated length as a value that could be greater
      than 64K, while csum_tcpudp_magic was truncating the length at 16 bits.
      After looking over the code and giving it some thought I decided it would
      be best to update the IPv4 function so that it worked the same way the IPv6
      one did.  This allows us to get the same results given the same inputs for
      both functions.  As a result we can use the same processes to reverse the
      calculation in the event we need to do something like remove the length of
      the pseudo-header checksum.
      
      I also took the opportunity to standardize things so that the parameters
      for these functions all use the correct types.  IPv4 addresses are __be32,
      length should always be __u32, and protocol is a __u8.
      
      With this change in place it corrects an issue with UDP tunnels in which we
      were getting a checksum that was off by 1 when performing fragmentation on
      inner UDP packets.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      20db778e
    • A
      GSO/UDP: Use skb->len instead of udph->len to determine length of original skb · 08334824
      Alexander Duyck 提交于
      It is possible for tunnels to end up generating IP or IPv6 datagrams that
      are larger than 64K and expecting to be segmented.  As such we need to deal
      with length values greater than 64K.  In order to accommodate this we need
      to update the code to work with a 32b length value instead of a 16b one.
      Signed-off-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      08334824
    • A
      ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short · 1e940829
      Alexander Duyck 提交于
      This patch updates csum_ipv6_magic so that it correctly recognizes that
      protocol is a unsigned 8 bit value.
      
      This will allow us to better understand what limitations may or may not be
      present in how we handle the data.  For example there are a number of
      places that call htonl on the protocol value.  This is likely not necessary
      and can be replaced with a multiplication by ntohl(1) which will be
      converted to a shift by the compiler.
      Signed-off-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1e940829
    • A
      ipv4: Update parameters for csum_tcpudp_magic to their original types · 01cfbad7
      Alexander Duyck 提交于
      This patch updates all instances of csum_tcpudp_magic and
      csum_tcpudp_nofold to reflect the types that are usually used as the source
      inputs.  For example the protocol field is populated based on nexthdr which
      is actually an unsigned 8 bit value.  The length is usually populated based
      on skb->len which is an unsigned integer.
      
      This addresses an issue in which the IPv6 function csum_ipv6_magic was
      generating a checksum using the full 32b of skb->len while
      csum_tcpudp_magic was only using the lower 16 bits.  As a result we could
      run into issues when attempting to adjust the checksum as there was no
      protocol agnostic way to update it.
      
      With this change the value is still truncated as many architectures use
      "(len + proto) << 8", however this truncation only occurs for values
      greater than 16776960 in length and as such is unlikely to occur as we stop
      the inner headers at ~64K in size.
      
      I did have to make a few minor changes in the arm, mn10300, nios2, and
      score versions of the function in order to support these changes as they
      were either using things such as an OR to combine the protocol and length,
      or were using ntohs to convert the length which would have truncated the
      value.
      
      I also updated a few spots in terms of whitespace and type differences for
      the addresses.  Most of this was just to make sure all of the definitions
      were in sync going forward.
      Signed-off-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      01cfbad7
    • D
      ipv4: Don't do expensive useless work during inetdev destroy. · fbd40ea0
      David S. Miller 提交于
      When an inetdev is destroyed, every address assigned to the interface
      is removed.  And in this scenerio we do two pointless things which can
      be very expensive if the number of assigned interfaces is large:
      
      1) Address promotion.  We are deleting all addresses, so there is no
         point in doing this.
      
      2) A full nf conntrack table purge for every address.  We only need to
         do this once, as is already caught by the existing
         masq_dev_notifier so masq_inet_event() can skip this.
      Reported-by: NSolar Designer <solar@openwall.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Tested-by: NCyrill Gorcunov <gorcunov@openvz.org>
      fbd40ea0
    • D
      Merge tag 'nfc-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · f4fa6e6d
      David S. Miller 提交于
      Samuel Ortiz says:
      
      ====================
      NFC 4.6 pull request
      
      This is a very small one this time, with only 5 patches.
      There are a couple of big items that could not be merged/finished
      on time.
      
      We have:
      
      - 2 LLCP fixes for a race and a potential OOM.
      - 2 cleanups for the pn544 and microread drivers.
      - 1 Maintainer addition for the s3fwrn5 driver.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f4fa6e6d
    • D
      Merge branch 'macsec' · 01099881
      David S. Miller 提交于
      Sabrina Dubroca says:
      
      ====================
      MACsec IEEE 802.1AE implementation
      
      MACsec (IEEE 802.1AE [0]) is a protocol that provides security for
      wired ethernet LANs.  MACsec offers two protection modes:
      authentication only, or authenticated encryption.
      
      MACsec defines "secure channels" that allow transmission from one node
      to one or more others.  Communication on a channel is done over a
      succession of "secure associations", that each use a specific key.
      Secure associations are identified by their "association number" in
      the range 0..3.  A secure association is retired when its 32-bit
      packet number would wrap, and the same association number can later be
      reused with a new key and packet number.
      
      The standard mode of encryption is GCM AES with 128 bits keys,
      although an extension allows 256 bits keys [1] (not implemented in
      this submission).
      
      When using MACsec, an extra header, called "SecTAG", is added between
      the ethernet header and the original payload:
      
       +---------------------------------+----------------+----------------+
       |        (MACsec ethertype)       |     TCI_AN     |       SL       |
       +---------------------------------+----------------+----------------+
       |                           Packet Number                           |
       +-------------------------------------------------------------------+
       |                     Secure Channel Identifier                     |
       |                            (optional)                             |
       +-------------------------------------------------------------------+
      
      TCI_AN:
       version
       end_station
       sci_present
       scb
       encrypted
       changed_text
       association_number (2 bits)
      SL:
       short_length (6 bits)
       unused (2 bits)
      
      The ethertype for the packet is set to 0x88E5, and the original
      ethertype becomes part of the secure payload, which may be encrypted.
      The ethernet header and the SecTAG are always transmitted in the
      clear, but are integrity-protected.
      
      MACsec supports optional replay protection with a configurable replay
      window.
      
      MACsec is designed to be used with the MKA extension to 802.1X (MACsec
      Key Agreement protocol) [2], which provides channel attribution and
      key distribution to the nodes, but can also be used with static keys
      getting fed manually by an administrator.
      
      Optional (not supported yet) features:
       - confidentiality offset: in encryption mode, part of the payload may
         be left unencrypted.
       - choice of cipher suite: GCM AES with 256 bits has been standardised
         [1].
      
      Implementation
      
      A netdevice is created on top of a real device for each TX secure
      channel, like we do for VLANs.  Multiple TX channels can be created on
      top of the same underlying device.
      
      Several other approaches were considered for the RX path:
      
       - dev_add_pack: doesn't work, because we want to filter out
         unprotected packets
       - transparent mode: MACsec would be enabled directly on the real
         netdevice.  For this, we cannot use a rx_handler directly because
         MACsec must be available for underlying devices enslaved in a
         bridge or in a bond, so we need a hook directly in
         __netif_receive_skb_core.  This approach makes it harder to filter
         non-encrypted packets on RX without forcing the user to setup some
         rules, so the "transparent" mode is not so transparent after all.
         It also makes TX more complex than with a dedicated netdevice.
      
      One issue with the proposed implementation is that the qdisc layer for
      the real device operates on already encrypted packets.
      
      Netlink API
      
      This is currently a mix of rtnetlink (to create the device and set up
      the TX channel) and genl (for RX channels, secure associations and
      their keys).  genl provides clean demultiplexing of the {TX,RX}{SC,SA}
      commands.
      
      Use cases
      
      The normal use case is wired LANs, including veth and slave devices
      for bonding/teaming or bridges.
      
      MACsec can also be used on any device that makes a full ethernet
      header visible, for example VXLAN.
      The VXLAN+MACsec setup would be:
      
               hypervisor        |     virtual machine
          <real_dev>---<VXLAN>---|---<dev>---<macsec_dev>
      
      And the packets would look like this:
      
      | eth | IP | UDP | VXLAN | eth | MACsec | IP | ... | MACsec ICV |
      
      One benefit on this approach to encryption in the cloud is that the
      payload is encrypted by the tenant, not by the tunnel provider, thus
      the tenant has full control over the keys.
      
      Changes from v1:
       - rework netlink API after discussion with Johannes Berg
         - nest attributes, rename
         - export stats as separate attributes
         - add some comments
       - misc small fixes (rcu, constants, struct organization)
      
      Changes from RFCv2:
       - fix ENCODING_SA param validation
       - add parent link to netlink ifdumps
      
      Changes from RFCv1:
       - addressed comments from Florian and Paolo + kbuild robot
       - also perform post-decrypt handling after crypto callback
       - fixed ->dellink behavior
      
      Future plans:
       - offload to hardware, on nics that support it
       - implement optional features
      
      [0] http://standards.ieee.org/getieee802/download/802.1AE-2006.pdf
      [1] http://standards.ieee.org/getieee802/download/802.1AEbn-2011.pdf
      [2] http://standards.ieee.org/getieee802/download/802.1X-2010.pdf
      [3] RFCv1: http://www.spinics.net/lists/netdev/msg358151.html
      [4] RFCv2: http://www.spinics.net/lists/netdev/msg362389.html
      [5] v1: http://www.spinics.net/lists/netdev/msg367959.html
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      01099881
    • S
      macsec: introduce IEEE 802.1AE driver · c09440f7
      Sabrina Dubroca 提交于
      This is an implementation of MACsec/IEEE 802.1AE.  This driver
      provides authentication and encryption of traffic in a LAN, typically
      with GCM-AES-128, and optional replay protection.
      
      http://standards.ieee.org/getieee802/download/802.1AE-2006.pdfSigned-off-by: NSabrina Dubroca <sd@queasysnail.net>
      Reviewed-by: NHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c09440f7
    • S
    • S
      dece8d2b
    • L
      net: socket: use pr_info_once to tip the obsolete usage of PF_PACKET · f3c98690
      liping.zhang 提交于
      There is no need to use the static variable here, pr_info_once is more
      concise.
      Signed-off-by: NLiping Zhang <liping.zhang@spreadtrum.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f3c98690
    • Z
      at803x: fix suspend/resume for SGMII link · 98267311
      Zefir Kurtisi 提交于
      When operating the at803x in SGMII mode, resuming the chip
      from power down brings up the copper-side link but leaves
      the SGMII link in unconnected state (tested with at8031
      attached to gianfar). In effect, this caused a permanent
      link loss once the related interface was put down.
      
      This patch ensures that power down handling in supspend()
      and resume() is also applied to the SGMII link.
      Signed-off-by: NZefir Kurtisi <zefir.kurtisi@neratec.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      98267311
    • D
      Merge branch 'net-more-bulk-free-users' · 5d608414
      David S. Miller 提交于
      Jesper Dangaard Brouer says:
      
      ====================
      net: bulk free adjustment and two driver use-cases
      
      I've split out the bulk free adjustments, from the bulk alloc patches,
      as I want the adjustment to napi_consume_skb be in same kernel cycle
      the API was introduced.
      
      Adjustments based on discussion:
       Subj: "mlx4: use napi_consume_skb API to get bulk free operations"
       http://thread.gmane.org/gmane.linux.network/402503/focus=403386
      
      Patchset based on net-next at commit 3ebeac1d
      
      V4: more nitpicks from Sergei
      V3: spelling fixes from Sergei
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5d608414
    • J
      mlx5: use napi_consume_skb API to get bulk free operations · 8ec736e5
      Jesper Dangaard Brouer 提交于
      Bulk free of SKBs happen transparently by the API call napi_consume_skb().
      The napi budget parameter is needed by napi_consume_skb() to detect
      if called from netpoll.
      Signed-off-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8ec736e5
    • J
      mlx4: use napi_consume_skb API to get bulk free operations · b4a53379
      Jesper Dangaard Brouer 提交于
      Bulk free of SKBs happen transparently by the API call napi_consume_skb().
      The napi budget parameter is usually needed by napi_consume_skb()
      to detect if called from netpoll.  In this patch it has an extra meaning.
      
      For mlx4 driver, the mlx4_en_stop_port() call is done outside
      NAPI/softirq context, and cleanup the entire TX ring via
      mlx4_en_free_tx_buf().  The code mlx4_en_free_tx_desc() for
      freeing SKBs are shared with NAPI calls.
      
      To handle this shared use the zero budget indication is reused,
      and handled appropriately in napi_consume_skb(). To reflect this,
      variable is called napi_mode for the function call that needed
      this distinction.
      Signed-off-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4a53379
    • J
      net: adjust napi_consume_skb to handle non-NAPI callers · 885eb0a5
      Jesper Dangaard Brouer 提交于
      Some drivers reuse/share code paths that free SKBs between NAPI
      and non-NAPI calls. Adjust napi_consume_skb to handle this
      use-case.
      
      Before, calls from netpoll (w/ IRQs disabled) was handled and
      indicated with a budget zero indication.  Use the same zero
      indication to handle calls not originating from NAPI/softirq.
      Simply handled by using dev_consume_skb_any().
      
      This adds an extra branch+call for the netpoll case (checking
      in_irq() + irqs_disabled()), but that is okay as this is a slowpath.
      Suggested-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      885eb0a5
    • C
      r8169:Remove unnecessary phy reset for pcie nic when setting link spped. · c4556975
      Chun-Hao Lin 提交于
      For pcie nic, after setting link speed and there is no link driver does not need
      to do phy reset until link up.
      
      For some pcie nics, to do this will also reset phy speed down counter and prevent
      phy from auto speed down.
      
      This patch fix the issue reported in following link.
      https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1547151Signed-off-by: NChunhao Lin <hau@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c4556975
    • J
      mlxsw: pci: Implement reset done check · 233fa44b
      Jiri Pirko 提交于
      Firmware now tells us that the reset is done by passing a magic value
      via register. Use it to shorten the wait in case this is supported.
      With old firmware, we still wait until the timeout is reached.
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      233fa44b
    • M
      sctp: allow sctp_transmit_packet and others to use gfp · cea8768f
      Marcelo Ricardo Leitner 提交于
      Currently sctp_sendmsg() triggers some calls that will allocate memory
      with GFP_ATOMIC even when not necessary. In the case of
      sctp_packet_transmit it will allocate a linear skb that will be used to
      construct the packet and this may cause sends to fail due to ENOMEM more
      often than anticipated specially with big MTUs.
      
      This patch thus allows it to inherit gfp flags from upper calls so that
      it can use GFP_KERNEL if it was triggered by a sctp_sendmsg call or
      similar. All others, like retransmits or flushes started from BH, are
      still allocated using GFP_ATOMIC.
      
      In netperf tests this didn't result in any performance drawbacks when
      memory is not too fragmented and made it trigger ENOMEM way less often.
      Signed-off-by: NMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cea8768f
    • S
      ovs: allow nl 'flow set' to use ufid without flow key · 6f15cdbf
      Samuel Gauthier 提交于
      When we want to change a flow using netlink, we have to identify it to
      be able to perform a lookup. Both the flow key and unique flow ID
      (ufid) are valid identifiers, but we always have to specify the flow
      key in the netlink message. When both attributes are there, the ufid
      is used. The flow key is used to validate the actions provided by
      the userland.
      
      This commit allows to use the ufid without having to provide the flow
      key, as it is already done in the netlink 'flow get' and 'flow del'
      path. The flow key remains mandatory when an action is provided.
      Signed-off-by: NSamuel Gauthier <samuel.gauthier@6wind.com>
      Reviewed-by: NSimon Horman <simon.horman@netronome.com>
      Acked-by: NPravin B Shelar <pshelar@ovn.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6f15cdbf
    • N
      net: macb: fix default configuration for GMAC on AT91 · 6bdaa5e9
      Nicolas Ferre 提交于
      On AT91 SoCs, the User Register (USRIO) exposes a switch to configure the
      "Reduced" or "Traditional" version of the Media Independent Interface
      (RMII vs. MII or RGMII vs. GMII).
      As on the older EMAC version, on GMAC, this switch is set by default to the
      non-reduced type of interface, so use the existing capability and extend it to
      GMII as well. We then keep the current logic in the macb_init() function.
      
      The capabilities of sama5d2, sama5d4 and sama5d3 GEM interface are updated in
      the macb_config structure to be able to properly enable them with a traditional
      interface (GMII or MII).
      Reported-by: NRomain HENRIET <romain.henriet@l-acoustics.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6bdaa5e9
    • L
      phy: remove documentation of removed members of phy_device structure · 470c3822
      LABBE Corentin 提交于
      Commit e5a03bfd ("phy: Add an mdio_device structure") removed addr,
      bus and dev member of the phy_device structure.
      This patch remove the documentation about those members.
      Signed-off-by: NLABBE Corentin <clabbe.montjoie@gmail.com>
      Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      470c3822
    • D
      Merge branch 'xen-netback-fix-multiple-extra-info-handling' · 3c4ef851
      David S. Miller 提交于
      Paul Durrant says:
      
      ====================
      xen-netback: fix multiple extra info handling
      
      If a frontend passes multiple extra info fragments to netback on the guest
      transmit side, because xen-netback does not account for this properly, only
      a single ack response will be sent. This will eventually cause processing
      of the shared ring to wedge.
      
      This series re-imports the canonical netif.h from Xen, where the ring
      protocol documentation has been updated, fixes this issue in xen-netback
      and also adds a patch to reduce log spam.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3c4ef851
    • P
      xen-netback: reduce log spam · 8e4ee59c
      Paul Durrant 提交于
      Remove the "prepare for reconnect" pr_info in xenbus.c. It's largely
      uninteresting and the states of the frontend and backend can easily be
      observed by watching the (o)xenstored log.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8e4ee59c
    • P
      xen-netback: support multiple extra info fragments passed from frontend · 562abd39
      Paul Durrant 提交于
      The code does not currently support a frontend passing multiple extra info
      fragments to the backend in a tx request. The xenvif_get_extras() function
      handles multiple extra_info fragments but make_tx_response() assumes there
      is only ever a single extra info fragment.
      
      This patch modifies xenvif_get_extras() to pass back a count of extra
      info fragments, which is then passed to make_tx_response() (after
      possibly being stashed in pending_tx_info for deferred responses).
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      562abd39
    • P
      xen-netback: re-import canonical netif header · 6b8abef5
      Paul Durrant 提交于
      The canonical netif header (in the Xen source repo) and the Linux variant
      have diverged significantly. Recently much documentation has been added to
      the canonical header which is highly useful for developers making
      modifications to either xen-netfront or xen-netback. This patch therefore
      re-imports the canonical header in its entirity.
      
      To maintain compatibility and some style consistency with the old Linux
      variant, the header was stripped of its emacs boilerplate, and
      post-processed and copied into place with the following commands:
      
      ed -s netif.h << EOF
      H
      ,s/NETTXF_/XEN_NETTXF_/g
      ,s/NETRXF_/XEN_NETRXF_/g
      ,s/NETIF_/XEN_NETIF_/g
      ,s/XEN_XEN_/XEN_/g
      ,s/netif/xen_netif/g
      ,s/xen_xen_/xen_/g
      ,s/^typedef.*$//g
      ,s/^    /${TAB}/g
      w
      $
      w
      EOF
      
      indent --line-length 80 --linux-style netif.h \
      -o include/xen/interface/io/netif.h
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6b8abef5
    • Z
      netconf: add macro to represent all attributes · 136ba622
      Zhang Shengju 提交于
      This patch adds macro NETCONFA_ALL to represent all type of netconf
      attributes for IPv4 and IPv6.
      Signed-off-by: NZhang Shengju <zhangshengju@cmss.chinamobile.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      136ba622
    • X
      sctp: fix the transports round robin issue when init is retransmitted · 39d2adeb
      Xin Long 提交于
      prior to this patch, at the beginning if we have two paths in one assoc,
      they may have the same params other than the last_time_heard, it will try
      the paths like this:
      
      1st cycle
        try trans1 fail.
        then trans2 is selected.(cause it's last_time_heard is after trans1).
      
      2nd cycle:
        try  trans2 fail
        then trans2 is selected.(cause it's last_time_heard is after trans1).
      
      3rd cycle:
        try  trans2 fail
        then trans2 is selected.(cause it's last_time_heard is after trans1).
      
      ....
      
      trans1 will never have change to be selected, which is not what we expect.
      we should keeping round robin all the paths if they are just added at the
      beginning.
      
      So at first every tranport's last_time_heard should be initialized 0, so
      that we ensure they have the same value at the beginning, only by this,
      all the transports could get equal chance to be selected.
      
      Then for sctp_trans_elect_best, it should return the trans_next one when
      *trans == *trans_next, so that we can try next if it fails,  but now it
      always return trans. so we can fix it by exchanging these two params when
      we calls sctp_trans_elect_tie().
      
      Fixes: 4c47af4d ('net: sctp: rework multihoming retransmission path selection to rfc4960')
      Signed-off-by: NXin Long <lucien.xin@gmail.com>
      Acked-by: NDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: NMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      39d2adeb
    • D
      rxrpc: Replace all unsigned with unsigned int · dad8aff7
      David Howells 提交于
      Replace all "unsigned" types with "unsigned int" types.
      Reported-by: NDavid Miller <davem@davemloft.net>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dad8aff7
    • D
      Merge tag 'wireless-drivers-next-for-davem-2016-03-09' of... · 00e3d2ef
      David S. Miller 提交于
      Merge tag 'wireless-drivers-next-for-davem-2016-03-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
      
      Kalle Valo says:
      
      ====================
      wireless-drivers patches for 4.6
      
      Major changes:
      
      ath10k
      
      * dt: add bindings for ipq4019 wifi block
      * start adding support for qca4019 chip
      
      ath9k
      
      * add device ID for Toshiba WLM-20U2/GN-1080
      * allow more than one interface on DFS channels
      
      bcma
      
      * move flash detection code to ChipCommon core driver
      
      brcmfmac
      
      * IPv6 Neighbor discovery offload
      * driver settings that can be populated from different sources
      * country code setting in firmware
      * length checks to validate firmware events
      * new way to determine device memory size needed for BCM4366
      * various offloads during Wake on Wireless LAN (WoWLAN)
      * full Management Frame Protection (MFP) support
      
      iwlwifi
      
      * add support for thermal device / cooling device
      * improvements in scheduled scan without profiles
      * new firmware support (-21.ucode)
      * add MSIX support for 9000 devices
      * enable MU-MIMO and take care of firmware restart
      * add support for large SKBs in mvm to reach A-MSDU
      * add support for filtering frames from a BA session
      * start implementing the new Rx path for 9000 devices
      * enable the new Radio Resource Management (RRM) nl80211 feature flag
      * add a new module paramater to disable VHT
      * build infrastructure for Dynamic Queue Allocation
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      00e3d2ef
    • D
      Merge branch 'net-minor-cleanups-and-optimizations' · f22f5f60
      David S. Miller 提交于
      Alexander Duyck says:
      
      ====================
      A couple of minor clean-ups and optimizations
      
      This patch series is basically just a v2 of a couple patches I recently
      submitted.
      
      The two patches aren't technically related but there are just items I found
      while cleaning up and prepping some further work to enable Tx checksums for
      tunnels.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f22f5f60
    • A
      csum: Update csum_block_add to use rotate instead of byteswap · 33803963
      Alexander Duyck 提交于
      The code for csum_block_add was doing a funky byteswap to swap the even and
      odd bytes of the checksum if the offset was odd.  Instead of doing this we
      can save ourselves some trouble and just shift by 8 as this should have the
      same effect in terms of the final checksum value and only requires one
      instruction.
      
      In addition we can update csum_block_sub to just use csum_block_add with a
      inverse value for csum2.  This way we follow the same code path as
      csum_block_add without having to duplicate it.
      Signed-off-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      33803963
    • A
      gro: Defer clearing of flush bit in tunnel paths · c194cf93
      Alexander Duyck 提交于
      This patch updates the GRO handlers for GRE, VXLAN, GENEVE, and FOU so that
      we do not clear the flush bit until after we have called the next level GRO
      handler.  Previously this was being cleared before parsing through the list
      of frames, however this resulted in several paths where either the bit
      needed to be reset but wasn't as in the case of FOU, or cases where it was
      being set as in GENEVE.  By just deferring the clearing of the bit until
      after the next level protocol has been parsed we can avoid any unnecessary
      bit twiddling and avoid bugs.
      Signed-off-by: NAlexander Duyck <aduyck@mirantis.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c194cf93
  2. 13 3月, 2016 1 次提交
  3. 12 3月, 2016 6 次提交