1. 15 10月, 2015 36 次提交
  2. 14 10月, 2015 4 次提交
    • Y
      net: hisilicon: supports promisc mode · 4568637f
      yankejian 提交于
      this patch adds support to set promisc mode. it configs the queue on
      init seq  when it is on promisc mode.and being enabled or disabled promisc
      mode by upper level user.
      Signed-off-by: Nyankejian <yankejian@huawei.com>
      Signed-off-by: NYisen Zhuang <yisen.zhuang@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4568637f
    • P
      Revert "ipv4/icmp: redirect messages can use the ingress daddr as source" · 02a6d613
      Paolo Abeni 提交于
      Revert the commit e2ca690b ("ipv4/icmp: redirect messages
      can use the ingress daddr as source"), which tried to introduce a more
      suitable behaviour for ICMP redirect messages generated by VRRP routers.
      However RFC 5798 section 8.1.1 states:
      
          The IPv4 source address of an ICMP redirect should be the address
          that the end-host used when making its next-hop routing decision.
      
      while said commit used the generating packet destination
      address, which do not match the above and in most cases leads to
      no redirect packets to be generated.
      Signed-off-by: NPaolo Abeni <pabeni@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      02a6d613
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 7d1f6411
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-10-13
      
      This series contains updates to i40e, i40evf, ixgbe and fm10k.
      
      Carolyn cleans up ndo_bridge_getlink() by flagging a parameter as
      __always_unused, since it is never used.  Adds a member to the nvm_info
      struct to store OEM version info to be output either by OID or ethtool.
      
      Neerav cleans up a remaining bit shift to use BIT() macro.
      
      Mitch fixes the i40evf driver to properly handle calls to its
      ndo_set_mac_address() method.  It did not properly check to see if the
      override would be allowed by the PF driver, and it never removed the old
      address from its filter list.  Cleaned up the use of
      i40e_enable_vf_mappings() in i40e_alloc_vfs(), since it is just redundant
      since we already call it by i40e_reset_vf().  Fixed a possible panic
      in some circumstances where the firmware may fail to allocate a VSI for
      a VF by checking the return value from i40e_alloc_vf_res() and don't
      try to configure the device further if it failed.
      
      Greg fixes the parsing of CEE App TLVs so the caller does not have to
      consider whether the App came from a CEE or IEEE DCBx negotiation.
      
      Shannon moves the device ids into a standalone file due to the desire
      to write user-land drivers (and other requests) without needing the rest
      of the include files.
      
      Catherine adds the ability to save the module information from
      get_phy_capabilities() to be used to determine which speeds the module
      supports.  Also cleaned up the PHY structure by removing unused members
      and add the ability to store the PHY capabilities reported by the
      firmware.
      
      Emil modifies ixgbe to ensure that flow control packets initiated by the
      VF are dropped and reported as spoofed.
      
      Jacob cleans up the fm10k driver to avoid buffer overflow by using
      sprintf(), so convert to using snprintf().  Also fixed the use of an
      enum as a boolean, so check for the actual value of NETREG_UNINITIALIZED
      in case it ever changes from the current value of zero.
      
      v2: Dropped patch 11 of the original series, which added functions that
          were never used.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7d1f6411
    • J
      fm10k: do not use enum as boolean · b4a5127b
      Jacob Keller 提交于
      Check for actual value NETREG_UNINITIALIZED in case it ever changes from
      the current value of zero.
      Signed-off-by: NJacob Keller <jacob.e.keller@intel.com>
      Signed-off-by: NBruce Allan <bruce.w.allan@intel.com>
      Tested-by: NKrishneil Singh <krishneil.k.singh@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      b4a5127b