diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /net/core | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/ethtool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 82cae3bca78d..d08a0c7675bf 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
| @@ -1280,6 +1280,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) | |||
| 1280 | case ETHTOOL_GPERMADDR: | 1280 | case ETHTOOL_GPERMADDR: |
| 1281 | case ETHTOOL_GUFO: | 1281 | case ETHTOOL_GUFO: |
| 1282 | case ETHTOOL_GGSO: | 1282 | case ETHTOOL_GGSO: |
| 1283 | case ETHTOOL_GGRO: | ||
| 1283 | case ETHTOOL_GFLAGS: | 1284 | case ETHTOOL_GFLAGS: |
| 1284 | case ETHTOOL_GPFLAGS: | 1285 | case ETHTOOL_GPFLAGS: |
| 1285 | case ETHTOOL_GRXFH: | 1286 | case ETHTOOL_GRXFH: |