mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

netlink: constify nlmsghdr arguments

Browse source 
Consitfy nlmsghdr arguments to a couple of functions as preparation
for the next patch, which will constify the netlink message data in
all nfnetlink users.

Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Patrick McHardy 2009-08-25 16:07:40 +02:00
parent 74f7a6552c
commit 3a6c2b419b
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/linux/netlink.h
View file

@ -217,12 +217,13 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
struct netlink_callback struct netlink_callback
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsghdr *nlh; const struct nlmsghdr *nlh;
int (*dump)(struct sk_buff * skb, struct netlink_callback *cb); int (*dump)(struct sk_buff * skb,
int (*done)(struct netlink_callback *cb); struct netlink_callback *cb);
int family; int (*done)(struct netlink_callback *cb);
long args[6]; int family;
long args[6];
}; };
struct netlink_notify struct netlink_notify
@ -258,7 +259,7 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
NLMSG_NEW(skb, pid, seq, type, len, 0) NLMSG_NEW(skb, pid, seq, type, len, 0)
extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
struct nlmsghdr *nlh, const struct nlmsghdr *nlh,
int (*dump)(struct sk_buff *skb, struct netlink_callback*), int (*dump)(struct sk_buff *skb, struct netlink_callback*),
int (*done)(struct netlink_callback*)); int (*done)(struct netlink_callback*));

4
include/net/netlink.h
View file

@ -365,7 +365,7 @@ static inline struct nlmsghdr *nlmsg_next(struct nlmsghdr *nlh, int *remaining)
* *
* See nla_parse() * See nla_parse()
*/ */
static inline int nlmsg_parse(struct nlmsghdr *nlh, int hdrlen, static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen,
struct nlattr *tb[], int maxtype, struct nlattr *tb[], int maxtype,
const struct nla_policy *policy) const struct nla_policy *policy)
{ {
@ -414,7 +414,7 @@ static inline int nlmsg_validate(struct nlmsghdr *nlh, int hdrlen, int maxtype,
* *
* Returns 1 if a report back to the application is requested. * Returns 1 if a report back to the application is requested.
*/ */
static inline int nlmsg_report(struct nlmsghdr *nlh) static inline int nlmsg_report(const struct nlmsghdr *nlh)
{ {
return !!(nlh->nlmsg_flags & NLM_F_ECHO); return !!(nlh->nlmsg_flags & NLM_F_ECHO);
} }

2
include/net/rtnetlink.h
View file

@ -14,7 +14,7 @@ extern void rtnl_register(int protocol, int msgtype,
extern int rtnl_unregister(int protocol, int msgtype); extern int rtnl_unregister(int protocol, int msgtype);
extern void rtnl_unregister_all(int protocol); extern void rtnl_unregister_all(int protocol);
static inline int rtnl_msg_family(struct nlmsghdr *nlh) static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
{ {
if (nlmsg_len(nlh) >= sizeof(struct rtgenmsg)) if (nlmsg_len(nlh) >= sizeof(struct rtgenmsg))
return ((struct rtgenmsg *) nlmsg_data(nlh))->rtgen_family; return ((struct rtgenmsg *) nlmsg_data(nlh))->rtgen_family;

2
net/netlink/af_netlink.c
View file

@ -1705,7 +1705,7 @@ static int netlink_dump(struct sock *sk)
} }
int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
struct nlmsghdr *nlh, const struct nlmsghdr *nlh,
int (*dump)(struct sk_buff *skb, int (*dump)(struct sk_buff *skb,
struct netlink_callback *), struct netlink_callback *),
int (*done)(struct netlink_callback *)) int (*done)(struct netlink_callback *))

2
net/sched/act_api.c
View file

@ -1011,7 +1011,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
} }
static struct nlattr * static struct nlattr *
find_dump_kind(struct nlmsghdr *n) find_dump_kind(const struct nlmsghdr *n)
{ {
struct nlattr *tb1, *tb2[TCA_ACT_MAX+1]; struct nlattr *tb1, *tb2[TCA_ACT_MAX+1];
struct nlattr *tb[TCA_ACT_MAX_PRIO + 1]; struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];