1. 05 Jan, 2016 2 commits
    • Arnd Bergmann's avatar
      net: make ip6tunnel_xmit definition conditional · 0efeff29
      Arnd Bergmann authored
      Moving the caller of iptunnel_xmit_stats causes a build error in
      randconfig builds that disable CONFIG_INET:
      
      In file included from ../net/xfrm/xfrm_input.c:17:0:
      ../include/net/ip6_tunnel.h: In function 'ip6tunnel_xmit':
      ../include/net/ip6_tunnel.h:93:2: error: implicit declaration of function 'iptunnel_xmit_stats' [-Werror=implicit-function-declaration]
        iptunnel_xmit_stats(dev, pkt_len);
      
      The reason is that the iptunnel_xmit_stats definition is hidden
      inside #ifdef CONFIG_INET but the caller is not. We can change
      one or the other to fix it, and this patch adds a second #ifdef
      around ip6tunnel_xmit() to avoid seeing the invalid call.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 039f5062 ("ip_tunnel: Move stats update to iptunnel_xmit()")
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0efeff29
    • David S. Miller's avatar
      Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · 15ab90f4
      David S. Miller authored
      Samuel Ortiz says:
      
      ====================
      NFC 4.5 pull request
      
      This is the first NFC pull request for 4.5 and it brings:
      
      - A new driver for the STMicroelectronics ST95HF NFC chipset.
        The ST95HF is an NFC digital transceiver with an embedded analog
        front-end and as such relies on the Linux NFC digital
        implementation. This is the 3rd user of the NFC digital stack.
      
      - ACPI support for the ST st-nci and st21nfca drivers.
      
      - A small improvement for the nfcsim driver, as we can now tune
        the Rx delay through sysfs.
      
      - A bunch of minor cleanups and small fixes from Christophe Ricard,
        for a few drivers and the NFC core code.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      15ab90f4
  2. 04 Jan, 2016 18 commits
  3. 31 Dec, 2015 11 commits
  4. 30 Dec, 2015 9 commits
    • Xin Long's avatar
      sctp: sctp should release assoc when sctp_make_abort_user return NULL in sctp_close · 068d8bd3
      Xin Long authored
      In sctp_close, sctp_make_abort_user may return NULL because of memory
      allocation failure. If this happens, it will bypass any state change
      and never free the assoc. The assoc has no chance to be freed and it
      will be kept in memory with the state it had even after the socket is
      closed by sctp_close().
      
      So if sctp_make_abort_user fails to allocate memory, we should abort
      the asoc via sctp_primitive_ABORT as well. Just like the annotation in
      sctp_sf_cookie_wait_prm_abort and sctp_sf_do_9_1_prm_abort said,
      "Even if we can't send the ABORT due to low memory delete the TCB.
      This is a departure from our typical NOMEM handling".
      
      But then the chunk is NULL (low memory) and the SCTP_CMD_REPLY cmd would
      dereference the chunk pointer, and system crash. So we should add
      SCTP_CMD_REPLY cmd only when the chunk is not NULL, just like other
      places where it adds SCTP_CMD_REPLY cmd.
      Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
      Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      068d8bd3
    • David S. Miller's avatar
      Merge tag 'wireless-drivers-for-davem-2015-12-28' of... · a0ccc3f2
      David S. Miller authored
      Merge tag 'wireless-drivers-for-davem-2015-12-28' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
      
      Kalle Valo says:
      
      ====================
      iwlwifi
      
      * don't load firmware that won't exist for 7260
      * fix RCU splat
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a0ccc3f2
    • Nicolai Stange's avatar
      net, socket, socket_wq: fix missing initialization of flags · 574aab1e
      Nicolai Stange authored
      Commit ceb5d58b ("net: fix sock_wake_async() rcu protection") from
      the current 4.4 release cycle introduced a new flags member in
      struct socket_wq and moved SOCKWQ_ASYNC_NOSPACE and SOCKWQ_ASYNC_WAITDATA
      from struct socket's flags member into that new place.
      
      Unfortunately, the new flags field is never initialized properly, at least
      not for the struct socket_wq instance created in sock_alloc_inode().
      
      One particular issue I encountered because of this is that my GNU Emacs
      failed to draw anything on my desktop -- i.e. what I got is a transparent
      window, including the title bar. Bisection lead to the commit mentioned
      above and further investigation by means of strace told me that Emacs
      is indeed speaking to my Xorg through an O_ASYNC AF_UNIX socket. This is
      reproducible 100% of times and the fact that properly initializing the
      struct socket_wq ->flags fixes the issue leads me to the conclusion that
      somehow SOCKWQ_ASYNC_WAITDATA got set in the uninitialized ->flags,
      preventing my Emacs from receiving any SIGIO's due to data becoming
      available and it got stuck.
      
      Make sock_alloc_inode() set the newly created struct socket_wq's ->flags
      member to zero.
      
      Fixes: ceb5d58b ("net: fix sock_wake_async() rcu protection")
      Signed-off-by: default avatarNicolai Stange <nicstange@gmail.com>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      574aab1e
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a3748a9c
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2015-12-29
      
      This series contains updates to ixgbe and ixgbevf.
      
      William Dauchy provides a fix for ixgbevf that was implemented for ixgbe,
      commit 5d6002b7 ("ixgbe: Fix handling of NAPI budget when multiple
      queues are enabled per vector"). The issue was that the polling routine
      would increase the budget for receive to at least 1 per queue if multiple
      queues were present, which resulted in receive packets being processed
      when the budget was 0.
      
      Emil provides minor cleanups for ixgbevf, one being that we need to
      check rx_itr_setting with == and not &, since it is not a mask.  Added
      QSFP PHY support in ixgbe to allow for more accurate reporting of port
      settings.  Fixed the max RSS limit for X550 which is 63, not 64.
      
      Veola fixes ixgbe ethtool reporting of backplane type interfaces as
      1000/10000baseT link modes, instead, report the media as KR, KX or KX4
      based on the backplane interface present.
      
      Mark cleans up redundancy in the setting of hw_enc_features that makes
      it appear that X550 has more encapsulation features than other devices.
      Also do not set NETIF_F_SG any longer since that is set by the
      register_netdev() call.  Also fixed the X550EM_x revision check, which
      needs to check a value, not just a bit.
      
      Alex Duyck fixes additional bugs in ixgbe_clear_vf_vlans(), one being
      that the mask was using a divide instead of a modulus, which resulted
      in the mask bit being incorrectly set to 0 or 1 based on the value of
      the VF being tested.  Alex also found that he was not consistent in
      using the "word" argument as an offset or as a register offset, so
      made the code consistently use word as the offset in the array.
      
      v2: dropped patch 8 of the original series, as it was undoing a part of
          the fix Alex Duyck was doing in patch 9 of the original series.
          Dropped based on feedback from Emil (the author).
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a3748a9c
    • David S. Miller's avatar
      Merge branch 'be2net-next' · 1ab8c11f
      David S. Miller authored
      Sathya Perla says:
      
      ====================
      be2net: patch set
      
      The following patch set contains some feature additions, code re-organization
      and cleanup and a few non-critical fixes. Pls consider applying this to
      the net-next tree. Thanks.
      
      v3 changes: add a default case to the switch statement in patch 5 to
      satisfy the compiler (-Wswitch).
      v2 changes: replaced an if/else block that checks for error values with a
      switch/case statement in patch 5.
      
      Patch 1 fixes VF link state transition from disabled to auto that did
      not work due to an issue in the FW. This issue could not be fixed in FW due
      to some backward compatibility issues it causes with released drivers.
      The issue has been fixed by introducing a new version (v2) of the cmd
      from 10.6 FW onwards. This patch adds support for v2 version of this cmd.
      
      Patch 2 reports a EOPNOTSUPP status to ethtool when the user tries to
      configure BE3/SRIOV in VEPA mode as it is not supported by the chip.
      
      Patch 3 cleansup FW flash image related constant definitions. Many of these
      definitions (such as section offset values) were defined in decimal format
      rather than hexa-decimal. This makes this part of the code un-readable.
      Also some defines related to BE2 are labeld "g2" and defines related to BE3
      are labeled "g3".  This patch cleans up all of this to make this code more
      readable.
      
      Patch 4 moves the FW cmd code to be_cmds.c. All code relating to FW cmds
      has been in be_cmds.[ch], excepting FW flash cmd related code.
      This patch moves these routines from be_main.c to be_cmds.c.
      
      Patch 5 adds a log message to report digital signature errors while
      flashing a FW image. From FW version 11.0 onwards, the FW supports a new
      "secure mode" feature (based on a jumper setting on the adapter.) In this
      mode, the FW image when flashed is authenticated with a digital signature.
      
      Patch 6 removes a line of code that has no effect.
      
      Patch 7 removes some unused variables.
      
      Patch 8 fixes port resource descriptor query via the GET_PROFILE FW cmd.
      An earlier commit passed a specific pf_num while issuing this cmd as FW
      returns descriptors for all functions when pf_num is zero. But, when pf_num
      is set to a non-zero value, FW does not return the port resource descriptor.
      This patch fixes this by setting pf_num to 0 while issuing the query cmd
      and adds code to pick the correct NIC resource descriptor from the list of
      descriptors returned by FW.
      
      Patch 9 adds support for ethtool get-dump feature. In the past when this
      option was not yet available, this feature was supported via the
      --register-dump option as a workaround.  This patch removes support for
      FW-dump via --register-dump option as it is now available via --get-dump
      option. Even though the "ethtool --register-dump" cmd which used to work
      earlier, will now fail with ENOTSUPP error, we feel it is not an issue as
      this is used only for diagnostics purpose.
      
      Patch 10 bumps up the driver version.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1ab8c11f
    • Suresh Reddy's avatar
    • Venkat Duvvuru's avatar
      be2net: support ethtool get-dump option · fd7ff6f0
      Venkat Duvvuru authored
      This patch adds support for ethtool's --get-dump option in be2net,
      to retrieve FW dump. In the past when this option was not yet available,
      this feature was supported via the --register-dump option as a workaround.
      This patch removes support for FW-dump via --register-dump option as it is
      now available via --get-dump option. Even though the
      "ethtool --register-dump" cmd which used to work earlier, will now fail
      with ENOTSUPP error, we feel it is not an issue as this is used only
      for diagnostics purpose.
      Signed-off-by: default avatarVenkat Duvvuru <venkatkumar.duvvuru@avagotech.com>
      Signed-off-by: default avatarSathya Perla <sathya.perla@avagotech.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fd7ff6f0
    • Suresh Reddy's avatar
      be2net: fix port-res desc query of GET_PROFILE_CONFIG FW cmd · 980df249
      Suresh Reddy authored
      Commit 72ef3a88 ("be2net: set pci_func_num while issuing
      GET_PROFILE_CONFIG cmd") passed a specific pf_num while issuing a
      GET_PROFILE_CONFIG cmd as FW returns descriptors for all functions when
      pf_num is zero. But, when pf_num is set to a non-zero value, FW does not
      return the Port resource descriptor.
      This patch fixes this by setting pf_num to 0 while issuing the query cmd
      and adds code to pick the correct NIC resource descriptor from the list of
      descriptors returned by FW.
      
      Fixes: 72ef3a88 ("be2net: set pci_func_num while issuing
      		     GET_PROFILE_CONFIG cmd")
      Signed-off-by: default avatarSuresh Reddy <suresh.reddy@avagotech.com>
      Signed-off-by: default avatarSathya Perla <sathya.perla@avagotech.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      980df249
    • Venkat Duvvuru's avatar
      be2net: remove unused error variables · 04e888de
      Venkat Duvvuru authored
      eeh_error, fw_timeout, hw_error variables in the be_adapter structure are
      not used anymore. An earlier patch that introduced adapter->err_flags to
      store this information missed removing these variables.
      Signed-off-by: default avatarVenkat Duvvuru <venkatkumar.duvvuru@avagotech.com>
      Signed-off-by: default avatarSathya Perla <sathya.perla@avagotech.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04e888de