From: Pravin B Shelar <pshelar@xxxxxxxxxx> 3.12-stable review patch. If anyone has any objections, please let me know. =============== part of commit f6eec614d2252a99b861e288b6301599d2d58da4 upstream. Add NETIF_F_GSO_ENCAP_ALL mask covering all encapsulation GSO flags. [mk] only introduce the helper, do not pick the openvswitch change the original commit was about. Signed-off-by: Pravin B Shelar <pshelar@xxxxxxxxxx> Acked-by: Andy Zhou <azhou@xxxxxxxxxx> Signed-off-by: Michal Kubecek <mkubecek@xxxxxxx> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> --- include/linux/netdev_features.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index a2a89a5c7be5..05009a1631fa 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -157,4 +157,8 @@ enum { /* changeable features with no special hardware requirements */ #define NETIF_F_SOFT_FEATURES (NETIF_F_GSO | NETIF_F_GRO) +#define NETIF_F_GSO_ENCAP_ALL (NETIF_F_GSO_GRE | \ + NETIF_F_GSO_UDP_TUNNEL | \ + NETIF_F_GSO_MPLS) + #endif /* _LINUX_NETDEV_FEATURES_H */ -- 2.10.2 -- 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