diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-04 20:57:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 20:57:25 +0100 |
| commit | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (patch) | |
| tree | 10f8363cbf5e428c0cb5614959e37b67a7e0cfa2 /net/can | |
| parent | net: typos in comments in include/linux/igmp.h (diff) | |
| parent | ipv4/route.c: respect prefsrc for local routes (diff) | |
| download | linux-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.tar.xz linux-dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/bcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 6faa8256e10c..9d5e8accfab1 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -125,7 +125,7 @@ struct bcm_sock { struct list_head tx_ops; unsigned long dropped_usr_msgs; struct proc_dir_entry *bcm_proc_read; - char procname [20]; /* pointer printed in ASCII with \0 */ + char procname [32]; /* inode number in decimal with \0 */ }; static inline struct bcm_sock *bcm_sk(const struct sock *sk) @@ -1521,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len, if (proc_dir) { /* unique socket address as filename */ - sprintf(bo->procname, "%p", sock); + sprintf(bo->procname, "%lu", sock_i_ino(sk)); bo->bcm_proc_read = proc_create_data(bo->procname, 0644, proc_dir, &bcm_proc_fops, sk); |