From: David S. Miller Date: Fri, 25 Jul 2014 06:40:00 +0000 (-0700) Subject: Merge branch 'macb-next' X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1e3550e46141b4734c237de69612175c13dc38cc;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'macb-next' Cyrille Pitchen says: ==================== net/macb: add HW features to macb driver this series of patches adds new hardware features to macb driver. These features can be enabled/disabled at runtime using ethtool. Depending on hardware and design configuration, some are enabled by default whereas other are disabled. For instance, checksum offload features are enabled by default for gem designed for packet buffer mode but disabled for fifo mode design or for old macb. Besides, the scatter-gather feature is enabled and tested on macb but disabled on sama5d3x gem. When testing this feature on sama5d3x gem, TX lockups occured frequently. Also, the RX checksum offload feature is enabled at GEM level only when both IFF_PROMISC bit is clear in dev->flags and NETIF_F_RXCSUM bit is set in dev->features. ==================== Signed-off-by: David S. Miller --- 1e3550e46141b4734c237de69612175c13dc38cc