git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
net
/
tipc
/
config.c
diff --git
a/net/tipc/config.c
b/net/tipc/config.c
index
fa3d508
..
b25a396
100644
(file)
--- a/
net/tipc/config.c
+++ b/
net/tipc/config.c
@@
-148,7
+148,7
@@
static struct sk_buff *cfg_enable_bearer(void)
args = (struct tipc_bearer_config *)TLV_DATA(req_tlv_area);
if (tipc_enable_bearer(args->name,
- ntohl(args->d
etect_scope
),
+ ntohl(args->d
isc_domain
),
ntohl(args->priority)))
return tipc_cfg_reply_error_string("unable to enable bearer");