Skip to content

Commit

Permalink
lapbether: convert to internal net_device_stats
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 22, 2009
1 parent d9b06c4 commit ea2ebaf
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions drivers/net/wan/lapbether.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ struct lapbethdev {
struct list_head node;
struct net_device *ethdev; /* link to ethernet device */
struct net_device *axdev; /* lapbeth device (lapb#) */
struct net_device_stats stats; /* some statistics */
};

static LIST_HEAD(lapbeth_devices);
Expand Down Expand Up @@ -107,10 +106,9 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
if (!netif_running(lapbeth->axdev))
goto drop_unlock;

lapbeth->stats.rx_packets++;

len = skb->data[0] + skb->data[1] * 256;
lapbeth->stats.rx_bytes += len;
dev->stats.rx_packets++;
dev->stats.rx_bytes += len;

skb_pull(skb, 2); /* Remove the length bytes */
skb_trim(skb, len); /* Set the length of the data */
Expand Down Expand Up @@ -210,8 +208,8 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb)
*ptr++ = size % 256;
*ptr++ = size / 256;

lapbeth->stats.tx_packets++;
lapbeth->stats.tx_bytes += size;
ndev->stats.tx_packets++;
ndev->stats.tx_bytes += size;

skb->dev = dev = lapbeth->ethdev;

Expand Down Expand Up @@ -254,15 +252,6 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
netif_rx(skb);
}

/*
* Statistics
*/
static struct net_device_stats *lapbeth_get_stats(struct net_device *dev)
{
struct lapbethdev *lapbeth = netdev_priv(dev);
return &lapbeth->stats;
}

/*
* Set AX.25 callsign
*/
Expand Down Expand Up @@ -321,7 +310,6 @@ static void lapbeth_setup(struct net_device *dev)
dev->stop = lapbeth_close;
dev->destructor = free_netdev;
dev->set_mac_address = lapbeth_set_mac_address;
dev->get_stats = lapbeth_get_stats;
dev->type = ARPHRD_X25;
dev->hard_header_len = 3;
dev->mtu = 1000;
Expand Down

0 comments on commit ea2ebaf

Please sign in to comment.