git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd: minor nfsd_vfs_write cleanup
[safe/jmp/linux-2.6]
/
drivers
/
net
/
pppoe.c
diff --git
a/drivers/net/pppoe.c
b/drivers/net/pppoe.c
index
074803a
..
f0031f1
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 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
struct pppoe_net {
/*
* we could use _single_ hash table for all
@@
-513,17
+513,17
@@
out:
return NET_RX_SUCCESS; /* Lies... :-) */
}
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,
};
.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,
};
.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),
.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->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];
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);
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,
skb->dev = dev;
dev_hard_header(skb, dev, ETH_P_PPP_SES,
@@
-1175,7
+1175,7
@@
static __net_exit void pppoe_exit_net(struct net *net)
kfree(pn);
}
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,
};
.init = pppoe_init_net,
.exit = pppoe_exit_net,
};