1. 28 2月, 2018 34 次提交
  2. 27 2月, 2018 6 次提交
    • A
      ipvlan: fix building with modular IPV6 · 7f897db3
      Arnd Bergmann 提交于
      We no longer depend on IPV6, but that now causes a link error with
      CONFIG_IPV6=m and CONFIG_IPVLAN=y:
      
      drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_queue_xmit':
      ipvlan_core.c:(.text+0x1440): undefined reference to `ip6_route_output_flags'
      drivers/net/ipvlan/ipvlan_core.o: In function `ipvlan_l3_rcv':
      ipvlan_core.c:(.text+0x1818): undefined reference to `ip6_route_input_lookup'
      
      This adds back the dependency on IPV6, with the option of building without
      IPV6, but forcing IPVLAN to be a module when IPV6 is a module.
      
      Fixes: 94333fac ("ipvlan: drop ipv6 dependency")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7f897db3
    • D
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 3808b519
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2018-02-26
      
      This series contains updates to ixgbe and ixgbevf only.
      
      Colin Ian King cleans up redundant variable assignments.
      
      Tonghao Zhang updates ixgbe to avoid writing to the hardware when the
      redirection table has not changed.
      
      Jake fixes the driver logic for checking and clearing receive timestamp
      hangs so that when the PTP_RX_TIMESTAMP_IN_REGISTER flag is set, we no
      longer need to check for receive timestamp hangs, which in turn will
      stop the spurious log messages.
      
      Emil updates ixgbevf with several features and improvements done in
      other drivers, starting with the handling of page addresses so that we
      always refer to them using a void pointer.  Added a 'legacy-rx' flag to
      allow switching between the old and new receive code paths.  Added
      support for using 3K buggers in order 1 page.  Updated the driver to
      ensure that calls to ixgbevf_open() are rtnl lock protected and improved
      the error handling when setting up multiple queues.  Added support for
      providing a buffer with head room and tail room to allow for shared
      info, NET_SKB_PAD, and NET_IP_ALIGN, so that we can start using
      build_skb to build frames instead of using memcpy() the headers.
      Updated the logic of handling rings closer to ixgbe.  Consolidated the
      receive paths to reduce duplication when we expand them in the future.
      Added build_skb() support to ixgbevf.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3808b519
    • A
      net: make kmem caches as __ro_after_init · 08009a76
      Alexey Dobriyan 提交于
      All kmem caches aren't reallocated once set up.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      08009a76
    • D
      Merge branch 'sonic-ethernet-cleanups' · cb31232a
      David S. Miller 提交于
      Finn Thain says:
      
      ====================
      Fixes, cleanup and modernization for SONIC ethernet drivers
      
      Changes since v4 of combined patch series:
      - Removed redundant and non-portable MACH_IS_MAC tests.
      - Omitted patches unrelated to SONIC drivers.
      - Dropped changes to the 'version_printed' logic and debug message text.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cb31232a
    • F
      net/sonic: Replace custom debug logging with netif_* calls · 995b2a65
      Finn Thain 提交于
      Eliminate duplicated debug code by moving it into the core driver.
      Don't log the only valid silicon revision number (it's in the source).
      
      Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
      Cc: Chris Zankel <chris@zankel.net>
      Tested-by: NStan Johnson <userm57@yahoo.com>
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      995b2a65
    • F
      net/sonic: Clean up and modernize log messages · bbc2f23a
      Finn Thain 提交于
      Add missing printk severity levels by adopting pr_foo() calls for the
      platform_driver and dev_foo() calls for the nubus_driver.
      Avoid KERN_CONT usage as per advice from checkpatch.
      Avoid #ifdef around printk calls.
      Don't log driver probe messages after calling register_netdev().
      
      Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
      Cc: Chris Zankel <chris@zankel.net>
      Tested-by: NStan Johnson <userm57@yahoo.com>
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bbc2f23a