Skip to content
  1. Jan 10, 2016
  2. Jan 09, 2016
    • David S. Miller's avatar
      Merge branch 'r8152-adjustments' · d86cdfcd
      David S. Miller authored
      
      
      Hayes Wang says:
      
      ====================
      r8152: code adjustment
      
      Adjust test_bit(), clear_bit(), disable_aldps(), and enable_aldps().
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d86cdfcd
    • hayeswang's avatar
      r8152: adjust ALDPS function · cda9fb01
      hayeswang authored
      
      
      Replace disable_aldps() and enable_aldps() with aldps_en().
      
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cda9fb01
    • hayeswang's avatar
      r8152: use test_and_clear_bit · 216a8349
      hayeswang authored
      
      
      Replace test_bit() followed by clear_bit() with test_and_clear_bit().
      
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      216a8349
    • Daniel Borkmann's avatar
      bpf: cleanup bpf_prog_run_{save,clear}_cb helpers · 01dd194c
      Daniel Borkmann authored
      
      
      Move the details behind the cb[] access into a small helper to decouple
      and make them generic for bpf_prog_run_save_cb()/bpf_prog_run_clear_cb()
      that was introduced via commit ff936a04 ("bpf: fix cb access in socket
      filter programs"). Also add a comment to better clarify what is done in
      bpf_skb_cb().
      
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      01dd194c
    • David S. Miller's avatar
      Merge branch 'net-sparse-warnings' · b351a063
      David S. Miller authored
      
      
      Lance Richardson says:
      
      ====================
      ipv4: fix various issues reported by sparse
      
      This trivial patch series addresses a number of endianness- and
      lock-related issues reported by sparse.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b351a063
    • Lance Richardson's avatar
      ipv4: eliminate lock count warnings in ping.c · ad64b8be
      Lance Richardson authored
      
      
      Add lock release/acquire annotations to ping_seq_start() and
      ping_seq_stop() to satisfy sparse.
      
      Signed-off-by: default avatarLance Richardson <lrichard@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ad64b8be
    • Lance Richardson's avatar
      ipv4: eliminate endianness warnings in ip_fib.h · 0797cbd8
      Lance Richardson authored
      
      
      fib_multipath_hash() computes a hash using __be32 values, force
      cast these to u32 to pacify sparse.
      
      Signed-off-by: default avatarLance Richardson <lrichard@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0797cbd8
    • Lance Richardson's avatar
      ipv4: fix endianness warnings in ip_tunnel_core.c · 30d3d83a
      Lance Richardson authored
      
      
      Eliminate endianness mismatch warnings (reported by sparse) in this file by
      using appropriate nla_put_*()/nla_get_*() calls.
      
      Signed-off-by: default avatarLance Richardson <lrichard@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30d3d83a
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 9b59377b
      David S. Miller authored
      
      
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for net-next, they are:
      
      1) Release nf_tables objects on netns destructions via
         nft_release_afinfo().
      
      2) Destroy basechain and rules on netdevice removal in the new netdev
         family.
      
      3) Get rid of defensive check against removal of inactive objects in
         nf_tables.
      
      4) Pass down netns pointer to our existing nfnetlink callbacks, as well
         as commit() and abort() nfnetlink callbacks.
      
      5) Allow to invert limit expression in nf_tables, so we can throttle
         overlimit traffic.
      
      6) Add packet duplication for the netdev family.
      
      7) Add forward expression for the netdev family.
      
      8) Define pr_fmt() in conntrack helpers.
      
      9) Don't leave nfqueue configuration on inconsistent state in case of
         errors, from Ken-ichirou MATSUZAWA, follow up patches are also from
         him.
      
      10) Skip queue option handling after unbind.
      
      11) Return error on unknown both in nfqueue and nflog command.
      
      12) Autoload ctnetlink when NFQA_CFG_F_CONNTRACK is set.
      
      13) Add new NFTA_SET_USERDATA attribute to store user data in sets,
          from Carlos Falgueras.
      
      14) Add support for 64 bit byteordering changes nf_tables, from Florian
          Westphal.
      
      15) Add conntrack byte/packet counter matching support to nf_tables,
          also from Florian.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9b59377b
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 7d397214
      David S. Miller authored
      
      
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2016-01-08
      
      This series contains updates to ixgbe only.
      
      Vasu provides three fixes for ixgbe, first assigns a minimum credit to
      a traffic class to resolve a Tx hang for CEE mode configuration.  Second
      fix changes the driver to use netdev->fcoe_ddp_xid instead of our local
      IXGBE_FCOE_DDP_MAX, since it is correctly set for our different devices
      and avoids a DDP skip error on X550.  Lastly fix the PFC configuration
      to include X550 devices.
      
      Emil provides a fix for reporting the speed in ethtool by using the
      stored value in out adapter structure.  This is due to external drivers
      may end up with unknown speed when calling ethtool_get_settings().
      
      Mark fixes the handling of any outer UDP checksum, by passing the
      skb up with CHECKSUM_NONE when an outer UDP checksum is set.  This
      will cause the stack to check the checksum, also do not increment an
      error counter because we do not really know if there is an actual error.
      Ixgbe ATR was not handling IPv6 extended headers, so ATR is not being
      performed on such packets.  Fix this by skipping extended headers
      when they are present.
      
      Usha fixes an issue with X550 and getting FDMI HBA attributes when
      FCoE support is enabled.
      
      Neerav fixes an issue for X550 when FCoE and SR-IOV are enabled, which
      the hardware generates MDD events.  Resolve this by setting the expected
      values in the transmit context descriptors for FCoE/FIP frames and
      adding a flush after writing the RDLEN register.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7d397214
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 250fbf12
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2016-01-08
      
      Here's one more bluetooth-next pull request for the 4.5 kernel:
      
       - Support for CRC check and promiscuous mode for CC2520
       - Fixes to btmrvl driver
       - New ACPI IDs for hci_bcm driver
       - Limited Discovery support for the Bluetooth mgmt interface
       - Minor other cleanups here and there
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      250fbf12
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a33ad9ac
      David S. Miller authored
      
      
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2016-01-08
      
      This series contains updates to i40e and i40evf only.
      
      Mitch adds a useful error message and return value when the VFs are being
      reset, since there is a brief window of time when the VF cannot be
      configured because they do not have a VSI to configure.  Also made a driver
      change to allow the user to specify a zero MAC address for VFs, which
      causes the existing MAC address to be removed and allows the VF to use a
      random address (like libvirt).
      
      Sowmini Varadhan from Oracle adds similar functionality/fix to i40e that
      was added to ixgbe earlier.  The fix attempts to look up the MAC address
      in the Open Firmware on systems that support it and use IDPROM on SPARC
      if no OF address is found.
      
      Anjali provides a fix the code path so that we do not call skb_set_hash()
      if the feature is disabled.
      
      Jesse removes a device ID that has never been productized and there are
      no plans to use it, so just remove it.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a33ad9ac
  3. Jan 08, 2016