From db115037bb57cdfe97078b13da762213f7980e81 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20Kube=C4=8Dek?= <mkubecek@suse.cz>
Date: Mon, 25 Aug 2014 15:16:22 +0200
Subject: [PATCH] net: fix checksum features handling in netif_skb_features()

This is follow-up to

  da08143b8520 ("vlan: more careful checksum features handling")

which introduced more careful feature intersection in vlan code,
taking into account that HW_CSUM should be considered superset
of IP_CSUM/IPV6_CSUM. The same is needed in netif_skb_features()
in order to avoid offloading mismatch warning when vlan is
created on top of a bond consisting of slaves supporting IP/IPv6
checksumming but not vlan Tx offloading.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
Reading git-format-patch failed