projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
net
/
sctp
/
proc.c
diff --git
a/net/sctp/proc.c
b/net/sctp/proc.c
index
a356d8d
..
2f12bf2
100644
(file)
--- a/
net/sctp/proc.c
+++ b/
net/sctp/proc.c
@@
-77,7
+77,7
@@
static struct snmp_mib sctp_snmp_list[] = {
/* Return the current value of a particular entry in the mib by adding its
* per cpu counters.
/* Return the current value of a particular entry in the mib by adding its
* per cpu counters.
- */
+ */
static unsigned long
fold_field(void *mib[], int nr)
{
static unsigned long
fold_field(void *mib[], int nr)
{
@@
-102,7
+102,7
@@
static int sctp_snmp_seq_show(struct seq_file *seq, void *v)
for (i = 0; sctp_snmp_list[i].name != NULL; i++)
seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i].name,
for (i = 0; sctp_snmp_list[i].name != NULL; i++)
seq_printf(seq, "%-32s\t%ld\n", sctp_snmp_list[i].name,
- fold_field((void **)sctp_statistics,
+ fold_field((void **)sctp_statistics,
sctp_snmp_list[i].entry));
return 0;
sctp_snmp_list[i].entry));
return 0;
@@
-114,7
+114,7
@@
static int sctp_snmp_seq_open(struct inode *inode, struct file *file)
return single_open(file, sctp_snmp_seq_show, NULL);
}
return single_open(file, sctp_snmp_seq_show, NULL);
}
-static struct file_operations sctp_snmp_seq_fops = {
+static
const
struct file_operations sctp_snmp_seq_fops = {
.owner = THIS_MODULE,
.open = sctp_snmp_seq_open,
.read = seq_read,
.owner = THIS_MODULE,
.open = sctp_snmp_seq_open,
.read = seq_read,
@@
-160,7
+160,7
@@
static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
list_for_each(pos, &epb->bind_addr.address_list) {
laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
list_for_each(pos, &epb->bind_addr.address_list) {
laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
- addr =
(union sctp_addr *)
&laddr->a;
+ addr = &laddr->a;
af = sctp_get_af_specific(addr->sa.sa_family);
if (primary && af->cmp_addr(addr, primary)) {
seq_printf(seq, "*");
af = sctp_get_af_specific(addr->sa.sa_family);
if (primary && af->cmp_addr(addr, primary)) {
seq_printf(seq, "*");
@@
-177,10
+177,10
@@
static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
union sctp_addr *addr, *primary;
struct sctp_af *af;
union sctp_addr *addr, *primary;
struct sctp_af *af;
- primary = &
(assoc->peer.primary_addr)
;
+ primary = &
assoc->peer.primary_addr
;
list_for_each(pos, &assoc->peer.transport_addr_list) {
transport = list_entry(pos, struct sctp_transport, transports);
list_for_each(pos, &assoc->peer.transport_addr_list) {
transport = list_entry(pos, struct sctp_transport, transports);
- addr =
(union sctp_addr *)
&transport->ipaddr;
+ addr = &transport->ipaddr;
af = sctp_get_af_specific(addr->sa.sa_family);
if (af->cmp_addr(addr, primary)) {
seq_printf(seq, "*");
af = sctp_get_af_specific(addr->sa.sa_family);
if (af->cmp_addr(addr, primary)) {
seq_printf(seq, "*");
@@
-264,7
+264,7
@@
static int sctp_eps_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &sctp_eps_ops);
}
return seq_open(file, &sctp_eps_ops);
}
-static struct file_operations sctp_eps_seq_fops = {
+static
const
struct file_operations sctp_eps_seq_fops = {
.open = sctp_eps_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.open = sctp_eps_seq_open,
.read = seq_read,
.llseek = seq_lseek,
@@
-344,7
+344,7
@@
static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
assoc, sk, sctp_sk(sk)->type, sk->sk_state,
assoc->state, hash, assoc->assoc_id,
assoc->sndbuf_used,
assoc, sk, sctp_sk(sk)->type, sk->sk_state,
assoc->state, hash, assoc->assoc_id,
assoc->sndbuf_used,
-
(sk->sk_rcvbuf - assoc->rwnd
),
+
atomic_read(&assoc->rmem_alloc
),
sock_i_uid(sk), sock_i_ino(sk),
epb->bind_addr.port,
assoc->peer.port);
sock_i_uid(sk), sock_i_ino(sk),
epb->bind_addr.port,
assoc->peer.port);
@@
-374,7
+374,7
@@
static int sctp_assocs_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &sctp_assoc_ops);
}
return seq_open(file, &sctp_assoc_ops);
}
-static struct file_operations sctp_assocs_seq_fops = {
+static
const
struct file_operations sctp_assocs_seq_fops = {
.open = sctp_assocs_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.open = sctp_assocs_seq_open,
.read = seq_read,
.llseek = seq_lseek,