| Message ID | 1363445275-3917-1-git-send-email-amwang@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Mar 16, 2013 at 7:47 AM, Cong Wang <amwang@redhat.com> wrote: > From: Cong Wang <amwang@redhat.com> > > Cc: Pravin B Shelar <pshelar@nicira.com> > Cc: "David S. Miller" <davem@davemloft.net> > Signed-off-by: Cong Wang <amwang@redhat.com> > Looks good. Acked-by: Pravin B Shelar <pshelar@nicira.com> > --- > > diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h > index f5e797c..d6ee2d0 100644 > --- a/include/linux/netdev_features.h > +++ b/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 */ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Cong Wang <amwang@redhat.com> Date: Sat, 16 Mar 2013 22:47:55 +0800 > From: Cong Wang <amwang@redhat.com> > > Cc: Pravin B Shelar <pshelar@nicira.com> > Cc: "David S. Miller" <davem@davemloft.net> > Signed-off-by: Cong Wang <amwang@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index f5e797c..d6ee2d0 100644 --- a/include/linux/netdev_features.h +++ b/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 */