diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
| commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
| tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /include/linux | |
| parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
| parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b332eefebb1b..83800091a31a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -557,7 +557,7 @@ struct netdev_queue { | |||
| 557 | * Callback uses when the transmitter has not made any progress | 557 | * Callback uses when the transmitter has not made any progress |
| 558 | * for dev->watchdog ticks. | 558 | * for dev->watchdog ticks. |
| 559 | * | 559 | * |
| 560 | * struct net_device_stats* (*get_stats)(struct net_device *dev); | 560 | * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); |
| 561 | * Called when a user wants to get the network device usage | 561 | * Called when a user wants to get the network device usage |
| 562 | * statistics. If not defined, the counters in dev->stats will | 562 | * statistics. If not defined, the counters in dev->stats will |
| 563 | * be used. | 563 | * be used. |