netrom: convert to internal net_device_stats
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
004b3225c0
commit
b51414b691
3 changed files with 3 additions and 17 deletions
|
@ -59,10 +59,6 @@ enum {
|
|||
#define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */
|
||||
#define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */
|
||||
|
||||
struct nr_private {
|
||||
struct net_device_stats stats;
|
||||
};
|
||||
|
||||
struct nr_sock {
|
||||
struct sock sock;
|
||||
ax25_address user_addr, source_addr, dest_addr;
|
||||
|
|
|
@ -1432,7 +1432,7 @@ static int __init nr_proto_init(void)
|
|||
struct net_device *dev;
|
||||
|
||||
sprintf(name, "nr%d", i);
|
||||
dev = alloc_netdev(sizeof(struct nr_private), name, nr_setup);
|
||||
dev = alloc_netdev(0, name, nr_setup);
|
||||
if (!dev) {
|
||||
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
|
||||
goto fail;
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct net_device_stats *stats = netdev_priv(dev);
|
||||
struct net_device_stats *stats = &dev->stats;
|
||||
|
||||
if (!netif_running(dev)) {
|
||||
stats->rx_dropped++;
|
||||
|
@ -171,8 +171,7 @@ static int nr_close(struct net_device *dev)
|
|||
|
||||
static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct nr_private *nr = netdev_priv(dev);
|
||||
struct net_device_stats *stats = &nr->stats;
|
||||
struct net_device_stats *stats = &dev->stats;
|
||||
unsigned int len = skb->len;
|
||||
|
||||
if (!nr_route_frame(skb, NULL)) {
|
||||
|
@ -187,13 +186,6 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct net_device_stats *nr_get_stats(struct net_device *dev)
|
||||
{
|
||||
struct nr_private *nr = netdev_priv(dev);
|
||||
|
||||
return &nr->stats;
|
||||
}
|
||||
|
||||
static const struct header_ops nr_header_ops = {
|
||||
.create = nr_header,
|
||||
.rebuild= nr_rebuild_header,
|
||||
|
@ -215,6 +207,4 @@ void nr_setup(struct net_device *dev)
|
|||
|
||||
/* New-style flags. */
|
||||
dev->flags = IFF_NOARP;
|
||||
|
||||
dev->get_stats = nr_get_stats;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue