projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[linux-2.6-block.git]
/
net
/
rose
/
af_rose.c
diff --git
a/net/rose/af_rose.c
b/net/rose/af_rose.c
index 0c1cc76128006e81d39b663f994de9e78f8539f5..01392649b4626d930eaba64175a5e50f1dc1f57c 100644
(file)
--- a/
net/rose/af_rose.c
+++ b/
net/rose/af_rose.c
@@
-690,7
+690,7
@@
static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
source = &addr->srose_call;
source = &addr->srose_call;
- user = ax25_findbyuid(current
->euid
);
+ user = ax25_findbyuid(current
_euid()
);
if (user) {
rose->source_call = user->call;
ax25_uid_put(user);
if (user) {
rose->source_call = user->call;
ax25_uid_put(user);
@@
-791,7
+791,7
@@
static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
goto out_release;
}
goto out_release;
}
- user = ax25_findbyuid(current
->euid
);
+ user = ax25_findbyuid(current
_euid()
);
if (!user) {
err = -EINVAL;
goto out_release;
if (!user) {
err = -EINVAL;
goto out_release;