Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 798b8cf5f9a67ec2c1ae1af3fe547e843c9099af..f0031f1f97e5e1b7bd52d825021fa3783c93885a 100644 (file)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -97,7 +97,7 @@ static const struct proto_ops pppoe_ops;
 static struct ppp_channel_ops pppoe_chan_ops;
 
 /* per-net private data for this module */
-static unsigned int pppoe_net_id;
+static int pppoe_net_id;
 struct pppoe_net {
        /*
         * we could use _single_ hash table for all
@@ -513,17 +513,17 @@ out:
        return NET_RX_SUCCESS; /* Lies... :-) */
 }
 
-static struct packet_type pppoes_ptype = {
-       .type   = __constant_htons(ETH_P_PPP_SES),
+static struct packet_type pppoes_ptype __read_mostly = {
+       .type   = cpu_to_be16(ETH_P_PPP_SES),
        .func   = pppoe_rcv,
 };
 
-static struct packet_type pppoed_ptype = {
-       .type   = __constant_htons(ETH_P_PPP_DISC),
+static struct packet_type pppoed_ptype __read_mostly = {
+       .type   = cpu_to_be16(ETH_P_PPP_DISC),
        .func   = pppoe_disc_rcv,
 };
 
-static struct proto pppoe_sk_proto = {
+static struct proto pppoe_sk_proto __read_mostly = {
        .name     = "PPPOE",
        .owner    = THIS_MODULE,
        .obj_size = sizeof(struct pppox_sock),
@@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
        skb->dev = dev;
 
        skb->priority = sk->sk_priority;
-       skb->protocol = __constant_htons(ETH_P_PPP_SES);
+       skb->protocol = cpu_to_be16(ETH_P_PPP_SES);
 
        ph = (struct pppoe_hdr *)skb_put(skb, total_len + sizeof(struct pppoe_hdr));
        start = (char *)&ph->tag[0];
@@ -937,7 +937,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
        ph->sid = po->num;
        ph->length = htons(data_len);
 
-       skb->protocol = __constant_htons(ETH_P_PPP_SES);
+       skb->protocol = cpu_to_be16(ETH_P_PPP_SES);
        skb->dev = dev;
 
        dev_hard_header(skb, dev, ETH_P_PPP_SES,
@@ -1040,7 +1040,7 @@ out:
 static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(pn->hash_lock)
 {
-       struct pppoe_net *pn = pppoe_pernet(seq->private);
+       struct pppoe_net *pn = pppoe_pernet(seq_file_net(seq));
        loff_t l = *pos;
 
        read_lock_bh(&pn->hash_lock);
@@ -1049,7 +1049,7 @@ static void *pppoe_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *pppoe_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       struct pppoe_net *pn = pppoe_pernet(seq->private);
+       struct pppoe_net *pn = pppoe_pernet(seq_file_net(seq));
        struct pppox_sock *po;
 
        ++*pos;
@@ -1077,7 +1077,7 @@ out:
 static void pppoe_seq_stop(struct seq_file *seq, void *v)
        __releases(pn->hash_lock)
 {
-       struct pppoe_net *pn = pppoe_pernet(seq->private);
+       struct pppoe_net *pn = pppoe_pernet(seq_file_net(seq));
        read_unlock_bh(&pn->hash_lock);
 }
 
@@ -1090,30 +1090,8 @@ static const struct seq_operations pppoe_seq_ops = {
 
 static int pppoe_seq_open(struct inode *inode, struct file *file)
 {
-       struct seq_file *m;
-       struct net *net;
-       int err;
-
-       err = seq_open(file, &pppoe_seq_ops);
-       if (err)
-               return err;
-
-       m = file->private_data;
-       net = maybe_get_net(PDE_NET(PDE(inode)));
-       BUG_ON(!net);
-       m->private = net;
-
-       return err;
-}
-
-static int pppoe_seq_release(struct inode *inode, struct file *file)
-{
-       struct seq_file *m;
-
-       m = file->private_data;
-       put_net((struct net*)m->private);
-
-       return seq_release(inode, file);
+       return seq_open_net(inode, file, &pppoe_seq_ops,
+                       sizeof(struct seq_net_private));
 }
 
 static const struct file_operations pppoe_seq_fops = {
@@ -1121,7 +1099,7 @@ static const struct file_operations pppoe_seq_fops = {
        .open           = pppoe_seq_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = pppoe_seq_release,
+       .release        = seq_release_net,
 };
 
 #endif /* CONFIG_PROC_FS */
@@ -1197,7 +1175,7 @@ static __net_exit void pppoe_exit_net(struct net *net)
        kfree(pn);
 }
 
-static __net_initdata struct pernet_operations pppoe_net_ops = {
+static struct pernet_operations pppoe_net_ops = {
        .init = pppoe_init_net,
        .exit = pppoe_exit_net,
 };