diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
| commit | 5c5095494fb545f53b80cbb7539679a10a3472a6 (patch) | |
| tree | d7c40cd66a58030ddef369bcb9acd8d95e2ac864 /net/core/ethtool.c | |
| parent | 4d586b823acc46c55c889ae1798de236c9d403da (diff) | |
| parent | def57687e9579b7a797681990dff763c411f5347 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | 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 b6f405888538..b8c2b10f397a 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 | |||
| 361 | /* NETIF_F_NTUPLE */ "rx-ntuple-filter", | 361 | /* NETIF_F_NTUPLE */ "rx-ntuple-filter", |
| 362 | /* NETIF_F_RXHASH */ "rx-hashing", | 362 | /* NETIF_F_RXHASH */ "rx-hashing", |
| 363 | /* NETIF_F_RXCSUM */ "rx-checksum", | 363 | /* NETIF_F_RXCSUM */ "rx-checksum", |
| 364 | /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy" | 364 | /* NETIF_F_NOCACHE_COPY */ "tx-nocache-copy", |
| 365 | /* NETIF_F_LOOPBACK */ "loopback", | 365 | /* NETIF_F_LOOPBACK */ "loopback", |
| 366 | }; | 366 | }; |
| 367 | 367 | ||