From 5ec0f64755c4c89ab71397a420031bef5422f515 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Sat, 16 Mar 2013 04:47:55 +0000 Subject: [PATCH] --- yaml --- r: 368299 b: refs/heads/master c: a362db3d6c8a952cbde510b1fa35d0ee001b347e h: refs/heads/master i: 368297: 8e01c21abe485322ea2655f60275912a55c39b11 368295: a31d0beead76f49dba629ae70b42be0715a1b654 v: v3 --- [refs] | 2 +- trunk/include/linux/netdev_features.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eca735590eab..80c98617f20c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86feff3f3eb643cc5735d414e46a8201a8c67b8f +refs/heads/master: a362db3d6c8a952cbde510b1fa35d0ee001b347e diff --git a/trunk/include/linux/netdev_features.h b/trunk/include/linux/netdev_features.h index f5e797c0c2a4..d6ee2d008ee4 100644 --- a/trunk/include/linux/netdev_features.h +++ b/trunk/include/linux/netdev_features.h @@ -102,8 +102,8 @@ enum { #define NETIF_F_VLAN_CHALLENGED __NETIF_F(VLAN_CHALLENGED) #define NETIF_F_RXFCS __NETIF_F(RXFCS) #define NETIF_F_RXALL __NETIF_F(RXALL) -#define NETIF_F_GRE_GSO __NETIF_F(GSO_GRE) -#define NETIF_F_UDP_TUNNEL __NETIF_F(UDP_TUNNEL) +#define NETIF_F_GSO_GRE __NETIF_F(GSO_GRE) +#define NETIF_F_GSO_UDP_TUNNEL __NETIF_F(GSO_UDP_TUNNEL) /* Features valid for ethtool to change */ /* = all defined minus driver/device-class-related */