Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
1dba9743
Commit
1dba9743
authored
Jan 05, 2006
by
Per Liden
Committed by
David S. Miller
Jan 12, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TIPC] Use dynamically allocated family id with NETLINK_GENERIC
Signed-off-by:
Per Liden
<
per.liden@nospam.ericsson.com
>
parent
b97bf3fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
include/linux/tipc.h
include/linux/tipc.h
+0
-1
net/tipc/netlink.c
net/tipc/netlink.c
+2
-2
No files found.
include/linux/tipc.h
View file @
1dba9743
...
@@ -539,7 +539,6 @@ static inline void TLV_LIST_STEP(struct tlv_list_desc *list)
...
@@ -539,7 +539,6 @@ static inline void TLV_LIST_STEP(struct tlv_list_desc *list)
* Configuration messages exchanged via NETLINK_GENERIC use the following
* Configuration messages exchanged via NETLINK_GENERIC use the following
* family id, name, version and command.
* family id, name, version and command.
*/
*/
#define TIPC_GENL_FAMILY 0x222
#define TIPC_GENL_NAME "TIPC"
#define TIPC_GENL_NAME "TIPC"
#define TIPC_GENL_VERSION 0x1
#define TIPC_GENL_VERSION 0x1
#define TIPC_GENL_CMD 0x1
#define TIPC_GENL_CMD 0x1
...
...
net/tipc/netlink.c
View file @
1dba9743
...
@@ -40,7 +40,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
...
@@ -40,7 +40,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
struct
nlmsghdr
*
rep_nlh
;
struct
nlmsghdr
*
rep_nlh
;
struct
nlmsghdr
*
req_nlh
=
info
->
nlhdr
;
struct
nlmsghdr
*
req_nlh
=
info
->
nlhdr
;
struct
tipc_genlmsghdr
*
req_userhdr
=
info
->
userhdr
;
struct
tipc_genlmsghdr
*
req_userhdr
=
info
->
userhdr
;
int
hdr_space
=
NLMSG_SPACE
(
0
);
int
hdr_space
=
NLMSG_SPACE
(
GENL_HDRLEN
+
TIPC_GENL_HDRLEN
);
if
((
req_userhdr
->
cmd
&
0xC000
)
&&
(
!
capable
(
CAP_NET_ADMIN
)))
if
((
req_userhdr
->
cmd
&
0xC000
)
&&
(
!
capable
(
CAP_NET_ADMIN
)))
rep_buf
=
cfg_reply_error_string
(
TIPC_CFG_NOT_NET_ADMIN
);
rep_buf
=
cfg_reply_error_string
(
TIPC_CFG_NOT_NET_ADMIN
);
...
@@ -63,7 +63,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
...
@@ -63,7 +63,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
}
}
static
struct
genl_family
family
=
{
static
struct
genl_family
family
=
{
.
id
=
TIPC_GENL_FAMILY
,
.
id
=
GENL_ID_GENERATE
,
.
name
=
TIPC_GENL_NAME
,
.
name
=
TIPC_GENL_NAME
,
.
version
=
TIPC_GENL_VERSION
,
.
version
=
TIPC_GENL_VERSION
,
.
hdrsize
=
TIPC_GENL_HDRLEN
,
.
hdrsize
=
TIPC_GENL_HDRLEN
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment