Message ID | 20110512164204.EC8391220061@host64.kissl.de |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
2011/5/12 <franco@lastsummer.de>: > The issue was introduced in commit eed2a12f1ed9aabf. > > Signed-off-by: Franco Fichtner <franco@lastsummer.de> > --- > net/core/ethtool.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/core/ethtool.c b/net/core/ethtool.c > index b6f4058..b8c2b10 100644 > --- a/net/core/ethtool.c > +++ b/net/core/ethtool.c > @@ -361,7 +361,7 @@ static const char > netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS > /* NETIF_F_NTUPLE */ "rx-ntuple-filter", > /* NETIF_F_RXHASH */ "rx-hashing", > /* NETIF_F_RXCSUM */ "rx-checksum", > - /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" > + /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", > /* NETIF_F_LOOPBACK */ "loopback", > }; Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> -- 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
On Thu, 2011-05-12 at 18:42 +0200, franco@lastsummer.de wrote: > The issue was introduced in commit eed2a12f1ed9aabf. > > Signed-off-by: Franco Fichtner <franco@lastsummer.de> Acked-by: Ben Hutchings <bhutchings@solarflare.com> > --- > net/core/ethtool.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/core/ethtool.c b/net/core/ethtool.c > index b6f4058..b8c2b10 100644 > --- a/net/core/ethtool.c > +++ b/net/core/ethtool.c > @@ -361,7 +361,7 @@ static const char > netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS > /* NETIF_F_NTUPLE */ "rx-ntuple-filter", > /* NETIF_F_RXHASH */ "rx-hashing", > /* NETIF_F_RXCSUM */ "rx-checksum", > - /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" > + /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", > /* NETIF_F_LOOPBACK */ "loopback", > }; >
On Thu, May 12, 2011 at 9:45 AM, Michał Mirosław <mirqus@gmail.com> wrote: > 2011/5/12 <franco@lastsummer.de>: >> The issue was introduced in commit eed2a12f1ed9aabf. >> >> Signed-off-by: Franco Fichtner <franco@lastsummer.de> >> --- >> net/core/ethtool.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/net/core/ethtool.c b/net/core/ethtool.c >> index b6f4058..b8c2b10 100644 >> --- a/net/core/ethtool.c >> +++ b/net/core/ethtool.c >> @@ -361,7 +361,7 @@ static const char >> netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS >> /* NETIF_F_NTUPLE */ "rx-ntuple-filter", >> /* NETIF_F_RXHASH */ "rx-hashing", >> /* NETIF_F_RXCSUM */ "rx-checksum", >> - /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" >> + /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", >> /* NETIF_F_LOOPBACK */ "loopback", >> }; > > Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > Acked-by: Mahesh Bandewar <maheshb@google.com> -- 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: Michał Mirosław <mirqus@gmail.com> Date: Thu, 12 May 2011 18:45:12 +0200 > 2011/5/12 <franco@lastsummer.de>: >> The issue was introduced in commit eed2a12f1ed9aabf. >> >> Signed-off-by: Franco Fichtner <franco@lastsummer.de> >> --- >> net/core/ethtool.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/net/core/ethtool.c b/net/core/ethtool.c >> index b6f4058..b8c2b10 100644 >> --- a/net/core/ethtool.c >> +++ b/net/core/ethtool.c >> @@ -361,7 +361,7 @@ static const char >> netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS >> /* NETIF_F_NTUPLE */ "rx-ntuple-filter", >> /* NETIF_F_RXHASH */ "rx-hashing", >> /* NETIF_F_RXCSUM */ "rx-checksum", >> - /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" >> + /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", >> /* NETIF_F_LOOPBACK */ "loopback", >> }; > > Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Applied, but this patch was significantly mangled by your email client. Please correct this problem before submitting future patches, as I will just push them back to you if this happens again. Thanks.
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index b6f4058..b8c2b10 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -361,7 +361,7 @@ static const char netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS /* NETIF_F_NTUPLE */ "rx-ntuple-filter", /* NETIF_F_RXHASH */ "rx-hashing", /* NETIF_F_RXCSUM */ "rx-checksum", - /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" + /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", /* NETIF_F_LOOPBACK */ "loopback", };
The issue was introduced in commit eed2a12f1ed9aabf. Signed-off-by: Franco Fichtner <franco@lastsummer.de> --- net/core/ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.7.3.2.493.g0b0cd -- 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