Commit b51414b6 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

netrom: convert to internal net_device_stats

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 004b3225
...@@ -59,10 +59,6 @@ enum { ...@@ -59,10 +59,6 @@ enum {
#define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */ #define NR_MAX_WINDOW_SIZE 127 /* Maximum Window Allowable - 127 */
#define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */ #define NR_MAX_PACKET_SIZE 236 /* Maximum Packet Length - 236 */
struct nr_private {
struct net_device_stats stats;
};
struct nr_sock { struct nr_sock {
struct sock sock; struct sock sock;
ax25_address user_addr, source_addr, dest_addr; ax25_address user_addr, source_addr, dest_addr;
......
...@@ -1432,7 +1432,7 @@ static int __init nr_proto_init(void) ...@@ -1432,7 +1432,7 @@ static int __init nr_proto_init(void)
struct net_device *dev; struct net_device *dev;
sprintf(name, "nr%d", i); sprintf(name, "nr%d", i);
dev = alloc_netdev(sizeof(struct nr_private), name, nr_setup); dev = alloc_netdev(0, name, nr_setup);
if (!dev) { if (!dev) {
printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n"); printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device structure\n");
goto fail; goto fail;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) 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)) { if (!netif_running(dev)) {
stats->rx_dropped++; stats->rx_dropped++;
...@@ -171,8 +171,7 @@ static int nr_close(struct net_device *dev) ...@@ -171,8 +171,7 @@ static int nr_close(struct net_device *dev)
static int nr_xmit(struct sk_buff *skb, 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 = &dev->stats;
struct net_device_stats *stats = &nr->stats;
unsigned int len = skb->len; unsigned int len = skb->len;
if (!nr_route_frame(skb, NULL)) { if (!nr_route_frame(skb, NULL)) {
...@@ -187,13 +186,6 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -187,13 +186,6 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
return 0; 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 = { static const struct header_ops nr_header_ops = {
.create = nr_header, .create = nr_header,
.rebuild= nr_rebuild_header, .rebuild= nr_rebuild_header,
...@@ -215,6 +207,4 @@ void nr_setup(struct net_device *dev) ...@@ -215,6 +207,4 @@ void nr_setup(struct net_device *dev)
/* New-style flags. */ /* New-style flags. */
dev->flags = IFF_NOARP; dev->flags = IFF_NOARP;
dev->get_stats = nr_get_stats;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment