1. 27 7月, 2015 2 次提交
    • J
      tipc: introduce new tipc_sk_respond() function · bcd3ffd4
      Jon Paul Maloy 提交于
      Currently, we use the code sequence
      
      if (msg_reverse())
         tipc_link_xmit_skb()
      
      at numerous locations in socket.c. The preparation of arguments
      for these calls, as well as the sequence itself, makes the code
      unecessarily complex.
      
      In this commit, we introduce a new function, tipc_sk_respond(),
      that performs this call combination. We also replace some, but not
      yet all, of these explicit call sequences with calls to the new
      function. Notably, we let the function tipc_sk_proto_rcv() use
      the new function to directly send out PROBE_REPLY messages,
      instead of deferring this to the calling tipc_sk_rcv() function,
      as we do now.
      Reviewed-by: NYing Xue <ying.xue@windriver.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bcd3ffd4
    • J
      tipc: let function tipc_msg_reverse() expand header when needed · 29042e19
      Jon Paul Maloy 提交于
      The shortest TIPC message header, for cluster local CONNECTED messages,
      is 24 bytes long. With this format, the fields "dest_node" and
      "orig_node" are optimized away, since they in reality are redundant
      in this particular case.
      
      However, the absence of these fields leads to code inconsistencies
      that are difficult to handle in some cases, especially when we need
      to reverse or reject messages at the socket layer.
      
      In this commit, we concentrate the handling of the absent fields
      to one place, by letting the function tipc_msg_reverse() reallocate
      the buffer and expand the header to 32 bytes when necessary. This
      means that the socket code now can assume that the two previously
      absent fields are present in the header when a message needs to be
      rejected. This opens up for some further simplifications of the
      socket code.
      Reviewed-by: NYing Xue <ying.xue@windriver.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      29042e19
  2. 25 7月, 2015 3 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a69e5a0d
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-07-23
      
      This series contains updates to e1000e, igb, ixgbevf, i40e and i40evf.
      
      Emil extends the reporting of the RSS key and hash table by adding support
      for x550 VFs.
      
      Jia-Ju Bai fixes a QoS issue in e1000e where the error handling lacked a
      call to pm_qos_remove_request() to cleanup the QoS request made in
      e1000_open().
      
      Todd updates igb to report unsupported for ethtool coalesce settings
      that are not supported.  Also updated the driver to use the ARRAY_SIZE()
      macro.
      
      Carolyn fixes and refactors the dynamic ITR code for i40e and i40evf
      which would never change dynamically.  So update the switch() statement
      to have a default case and switch on "new_latency_range" versus the
      current ITR setting.
      
      Shannon cleans up i40e code, where there were un-needed goto's.  Also
      clean up error status messages that were causing some confusion in
      PHY and FCoE setup error reports.
      
      Mitch updates the virtual channel interface to prepare for the x722 device
      and other future devices, so that the VF driver can report what its
      capable of supporting to the PF driver.  Updates the i40evf driver to
      handle resets like Core or EMP resets, where the device is reinitialized
      and the VF will not get the same VSI.
      
      Jesse updates the i40e and i40evf driver to use the kernel BIT() and
      BIT_ULL() macros.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a69e5a0d
    • R
      bridge: Fix setting a flag in br_fill_ifvlaninfo_range(). · 6ca91c60
      Rosen, Rami 提交于
      This patch fixes setting of vinfo.flags in the br_fill_ifvlaninfo_range() method. The
      assignment of vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN has no effect and is
      unneeded, as vinfo.flags value is overriden by the  immediately following
      vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END assignement.
      Signed-off-by: NRami Rosen <rami.rosen@intel.com>
      Acked-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6ca91c60
    • S
      be2net: support ndo_get_phys_port_id() · a155a5db
      Sriharsha Basavapatna 提交于
      Add be_get_phys_port_id() function to report physical port id. The port id
      should be unique across different be2net devices in the system. We use the
      chip serial number along with the physical port number for this.
      Signed-off-by: NSriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a155a5db
  3. 23 7月, 2015 29 次提交
  4. 22 7月, 2015 6 次提交