On 06/26/2014 08:36 AM, Michal Kubecek wrote: > On Wed, Jun 25, 2014 at 04:01:18PM +0200, Jiri Slaby wrote: >> From: Michal Kubeček <mkubecek@xxxxxxx> >> >> This patch has been added to the 3.12 stable tree. If you have any >> objections, please let us know. >> >> =============== >> >> commit da08143b85203b581f4a6461b149186b0e9592df upstream. >> >> When combining real_dev's features and vlan_features, simple >> bitwise AND is used. This doesn't work well for checksum >> offloading features as if one set has NETIF_F_HW_CSUM and the >> other NETIF_F_IP_CSUM and/or NETIF_F_IPV6_CSUM, we end up with >> no checksum offloading. However, from the logical point of view >> (how can_checksum_protocol() works), NETIF_F_HW_CSUM contains >> the functionality of NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM so >> that the result should be IP/IPV6. >> >> Add helper function netdev_intersect_features() implementing >> this logic and use it in vlan_dev_fix_features(). > > I noticed this was picked but not the two commits it came with: > > a9b3ace44 bonding: fix vlan_features computing > 3625920b6 teaming: fix vlan_features computing > > Is it intentional? FTR the offline discussion between us two resulted in "yes". -- js suse labs -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html