mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 21:24:08 +08:00
[NETLINK]: Explicit typing
This patch converts "unsigned flags" to use more explict types like u16 instead and incrementally introduces NLMSG_NEW(). Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
58b82150da
commit
e431b8c004
@ -131,7 +131,7 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp);
|
||||
|
||||
static int addrconf_ifdown(struct net_device *dev, int how);
|
||||
|
||||
static void addrconf_dad_start(struct inet6_ifaddr *ifp, int flags);
|
||||
static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags);
|
||||
static void addrconf_dad_timer(unsigned long data);
|
||||
static void addrconf_dad_completed(struct inet6_ifaddr *ifp);
|
||||
static void addrconf_rs_timer(unsigned long data);
|
||||
@ -492,7 +492,7 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)
|
||||
|
||||
static struct inet6_ifaddr *
|
||||
ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
|
||||
int scope, unsigned flags)
|
||||
int scope, u32 flags)
|
||||
{
|
||||
struct inet6_ifaddr *ifa = NULL;
|
||||
struct rt6_info *rt;
|
||||
@ -1320,7 +1320,7 @@ static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpad
|
||||
|
||||
static void
|
||||
addrconf_prefix_route(struct in6_addr *pfx, int plen, struct net_device *dev,
|
||||
unsigned long expires, unsigned flags)
|
||||
unsigned long expires, u32 flags)
|
||||
{
|
||||
struct in6_rtmsg rtmsg;
|
||||
|
||||
@ -2229,7 +2229,7 @@ out:
|
||||
/*
|
||||
* Duplicate Address Detection
|
||||
*/
|
||||
static void addrconf_dad_start(struct inet6_ifaddr *ifp, int flags)
|
||||
static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
|
||||
{
|
||||
struct inet6_dev *idev = ifp->idev;
|
||||
struct net_device *dev = idev->dev;
|
||||
@ -2671,7 +2671,7 @@ rtattr_failure:
|
||||
}
|
||||
|
||||
static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct ifmcaddr6 *ifmca,
|
||||
u32 pid, u32 seq, int event, unsigned flags)
|
||||
u32 pid, u32 seq, int event, u16 flags)
|
||||
{
|
||||
struct ifaddrmsg *ifm;
|
||||
struct nlmsghdr *nlh;
|
||||
|
@ -428,15 +428,15 @@ errout:
|
||||
|
||||
static int
|
||||
tca_get_fill(struct sk_buff *skb, struct tc_action *a, u32 pid, u32 seq,
|
||||
unsigned flags, int event, int bind, int ref)
|
||||
u16 flags, int event, int bind, int ref)
|
||||
{
|
||||
struct tcamsg *t;
|
||||
struct nlmsghdr *nlh;
|
||||
unsigned char *b = skb->tail;
|
||||
struct rtattr *x;
|
||||
|
||||
nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*t));
|
||||
nlh->nlmsg_flags = flags;
|
||||
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags);
|
||||
|
||||
t = NLMSG_DATA(nlh);
|
||||
t->tca_family = AF_UNSPEC;
|
||||
|
||||
@ -669,7 +669,7 @@ err:
|
||||
}
|
||||
|
||||
static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event,
|
||||
unsigned flags)
|
||||
u16 flags)
|
||||
{
|
||||
struct tcamsg *t;
|
||||
struct nlmsghdr *nlh;
|
||||
@ -684,8 +684,7 @@ static int tcf_add_notify(struct tc_action *a, u32 pid, u32 seq, int event,
|
||||
|
||||
b = (unsigned char *)skb->tail;
|
||||
|
||||
nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*t));
|
||||
nlh->nlmsg_flags = flags;
|
||||
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*t), flags);
|
||||
t = NLMSG_DATA(nlh);
|
||||
t->tca_family = AF_UNSPEC;
|
||||
|
||||
|
@ -322,14 +322,13 @@ errout:
|
||||
|
||||
static int
|
||||
tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, unsigned long fh,
|
||||
u32 pid, u32 seq, unsigned flags, int event)
|
||||
u32 pid, u32 seq, u16 flags, int event)
|
||||
{
|
||||
struct tcmsg *tcm;
|
||||
struct nlmsghdr *nlh;
|
||||
unsigned char *b = skb->tail;
|
||||
|
||||
nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*tcm));
|
||||
nlh->nlmsg_flags = flags;
|
||||
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
|
||||
tcm = NLMSG_DATA(nlh);
|
||||
tcm->tcm_family = AF_UNSPEC;
|
||||
tcm->tcm_ifindex = tp->q->dev->ifindex;
|
||||
|
@ -760,15 +760,14 @@ graft:
|
||||
}
|
||||
|
||||
static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
|
||||
u32 pid, u32 seq, unsigned flags, int event)
|
||||
u32 pid, u32 seq, u16 flags, int event)
|
||||
{
|
||||
struct tcmsg *tcm;
|
||||
struct nlmsghdr *nlh;
|
||||
unsigned char *b = skb->tail;
|
||||
struct gnet_dump d;
|
||||
|
||||
nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*tcm));
|
||||
nlh->nlmsg_flags = flags;
|
||||
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
|
||||
tcm = NLMSG_DATA(nlh);
|
||||
tcm->tcm_family = AF_UNSPEC;
|
||||
tcm->tcm_ifindex = q->dev->ifindex;
|
||||
@ -997,7 +996,7 @@ out:
|
||||
|
||||
static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
|
||||
unsigned long cl,
|
||||
u32 pid, u32 seq, unsigned flags, int event)
|
||||
u32 pid, u32 seq, u16 flags, int event)
|
||||
{
|
||||
struct tcmsg *tcm;
|
||||
struct nlmsghdr *nlh;
|
||||
@ -1005,8 +1004,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
|
||||
struct gnet_dump d;
|
||||
struct Qdisc_class_ops *cl_ops = q->ops->cl_ops;
|
||||
|
||||
nlh = NLMSG_PUT(skb, pid, seq, event, sizeof(*tcm));
|
||||
nlh->nlmsg_flags = flags;
|
||||
nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
|
||||
tcm = NLMSG_DATA(nlh);
|
||||
tcm->tcm_family = AF_UNSPEC;
|
||||
tcm->tcm_ifindex = q->dev->ifindex;
|
||||
|
Loading…
Reference in New Issue
Block a user