From: David S. Miller Date: Fri, 15 Nov 2013 22:55:58 +0000 (-0500) Subject: Merge branch 'macvlan' X-Git-Tag: firefly_0821_release~176^2~4920^2~21 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=82c80e9d9de354333aa69368576df6a355791418;p=firefly-linux-kernel-4.4.55.git Merge branch 'macvlan' Michal Kubecek says: ==================== macvlan: disable LRO on lowerdev instead of a macvlan A customer of ours encountered a problem with LRO on an ixgbe network card. Analysis showed that it was a known conflict of forwarding and LRO but the forwarding was enabled in an LXC container where only a macvlan was, not the ethernet device itself. I believe the solution is exactly the same as what we do for "normal" (802.1q) VLAN devices: if dev_disable_lro() is called for such device, LRO is disabled on the underlying "real" device instead. v2: adapt to changes merged from net-next v3: use BUG() in macvlan_dev_real_dev() if compiled without macvlan ==================== Signed-off-by: David S. Miller --- 82c80e9d9de354333aa69368576df6a355791418