Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 16 insertions, 23 deletions

diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 5b61b3eef45f..2dd78d20eb05 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -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);
@@ -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 */
@@ -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;
 
@@ -255,15 +253,6 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
 }
 
 /*
- *      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
  */
 static int lapbeth_set_mac_address(struct net_device *dev, void *addr)
@@ -314,14 +303,17 @@ static int lapbeth_close(struct net_device *dev)
 
 /* ------------------------------------------------------------------------ */
 
+static const struct net_device_ops lapbeth_netdev_ops = {
+        .ndo_open            = lapbeth_open,
+        .ndo_stop            = lapbeth_close,
+        .ndo_start_xmit      = lapbeth_xmit,
+        .ndo_set_mac_address = lapbeth_set_mac_address,
+};
+
 static void lapbeth_setup(struct net_device *dev)
 {
-        dev->hard_start_xmit = lapbeth_xmit;
-        dev->open            = lapbeth_open;
-        dev->stop            = lapbeth_close;
+        dev->netdev_ops      = &lapbeth_netdev_ops;
         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;
@@ -421,8 +413,8 @@ static int lapbeth_device_event(struct notifier_block *this,
 
 /* ------------------------------------------------------------------------ */
 
-static struct packet_type lapbeth_packet_type = {
-        .type = __constant_htons(ETH_P_DEC),
+static struct packet_type lapbeth_packet_type __read_mostly = {
+        .type = cpu_to_be16(ETH_P_DEC),
         .func = lapbeth_rcv,
 };
 
@@ -430,7 +422,8 @@ static struct notifier_block lapbeth_dev_notifier = {
         .notifier_call = lapbeth_device_event,
 };
 
-static char banner[] __initdata = KERN_INFO "LAPB Ethernet driver version 0.02\n";
+static const char banner[] __initconst =
+        KERN_INFO "LAPB Ethernet driver version 0.02\n";
 
 static int __init lapbeth_init_driver(void)
 {