net: replace uses of __constant_{endian}

[net-next-2.6.git] / drivers / net / hamradio / bpqether.c

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 46f8f3390e7d1806c038f791f0f103c744c09830..2c619bc99ae79fc9ea58ff565a7751fccd5032c0 100644 (file)
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -97,7 +97,7 @@ static int bpq_rcv(struct sk_buff *, struct net_device *, struct packet_type *,
 static int bpq_device_event(struct notifier_block *, unsigned long, void *);
 
 static struct packet_type bpq_packet_type = {
-       .type   = __constant_htons(ETH_P_BPQ),
+       .type   = cpu_to_be16(ETH_P_BPQ),
        .func   = bpq_rcv,
 };
 
@@ -110,7 +110,6 @@ struct bpqdev {
        struct list_head bpq_list;      /* list of bpq devices chain */
        struct net_device *ethdev;      /* link to ethernet device */
        struct net_device *axdev;       /* bpq device (bpq#) */
-       struct net_device_stats stats;  /* some statistics */
        char   dest_addr[6];            /* ether destination address */
        char   acpt_addr[6];            /* accept ether frames from this address only */
 };
@@ -222,8 +221,8 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
        skb_pull(skb, 2);       /* Remove the length bytes */
        skb_trim(skb, len);     /* Set the length of the data */
 
-       bpq->stats.rx_packets++;
-       bpq->stats.rx_bytes += len;
+       dev->stats.rx_packets++;
+       dev->stats.rx_bytes += len;
 
        ptr = skb_push(skb, 1);
        *ptr = 0;
@@ -292,7 +291,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
        bpq = netdev_priv(dev);
 
        if ((dev = bpq_get_ether_dev(dev)) == NULL) {
-               bpq->stats.tx_dropped++;
+               dev->stats.tx_dropped++;
                kfree_skb(skb);
                return -ENODEV;
        }
@@ -300,24 +299,14 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
        skb->protocol = ax25_type_trans(skb, dev);
        skb_reset_network_header(skb);
        dev_hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
-       bpq->stats.tx_packets++;
-       bpq->stats.tx_bytes+=skb->len;
+       dev->stats.tx_packets++;
+       dev->stats.tx_bytes+=skb->len;
   
        dev_queue_xmit(skb);
        netif_wake_queue(dev);
        return 0;
 }
 
-/*
- *     Statistics
- */
-static struct net_device_stats *bpq_get_stats(struct net_device *dev)
-{
-       struct bpqdev *bpq = netdev_priv(dev);
-
-       return &bpq->stats;
-}
-
 /*
  *     Set AX.25 callsign
  */
@@ -454,7 +443,7 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations bpq_seqops = {
+static const struct seq_operations bpq_seqops = {
        .start = bpq_seq_start,
        .next = bpq_seq_next,
        .stop = bpq_seq_stop,
@@ -477,16 +466,17 @@ static const struct file_operations bpq_info_fops = {
 
 /* ------------------------------------------------------------------------ */
 
+static const struct net_device_ops bpq_netdev_ops = {
+       .ndo_open            = bpq_open,
+       .ndo_stop            = bpq_close,
+       .ndo_start_xmit      = bpq_xmit,
+       .ndo_set_mac_address = bpq_set_mac_address,
+       .ndo_do_ioctl        = bpq_ioctl,
+};
 
 static void bpq_setup(struct net_device *dev)
 {
-
-       dev->hard_start_xmit = bpq_xmit;
-       dev->open            = bpq_open;
-       dev->stop            = bpq_close;
-       dev->set_mac_address = bpq_set_mac_address;
-       dev->get_stats       = bpq_get_stats;
-       dev->do_ioctl        = bpq_ioctl;
+       dev->netdev_ops      = &bpq_netdev_ops;
        dev->destructor      = free_netdev;
 
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);