net: ip_rt_get_source() - use new style struct initializer instead of memset
Subsystems (3)
PATCH v2 1/9 net: ip_rt_get_source() - use new style struct initializer instead of memset
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv4/route.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
net/ipv4/route.c +9 -12
@@ -1217,18 +1217,15 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt) src =ip_hdr (skb)->saddr; else {struct fib_result res; -struct flowi4 fl4; -struct iphdr *iph; - - iph =ip_hdr (skb); - -memset (&fl4,0 ,sizeof (fl4)); - fl4.daddr = iph->daddr; - fl4.saddr = iph->saddr; - fl4.flowi4_tos =RT_TOS (iph->tos); - fl4.flowi4_oif = rt->dst.dev->ifindex; - fl4.flowi4_iif = skb->dev->ifindex; - fl4.flowi4_mark = skb->mark; +struct iphdr *iph =ip_hdr (skb); +struct flowi4 fl4 = { + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowi4_tos =RT_TOS (iph->tos), + .flowi4_oif = rt->dst.dev->ifindex, + .flowi4_iif = skb->dev->ifindex, + .flowi4_mark = skb->mark, + };rcu_read_lock ();if (fib_lookup (dev_net (rt->dst.dev), &fl4, &res,0 ) ==0 )
Signature · 1 line
2.19.0.605.g01d371f741-goog
PATCH v2 2/9 net: inet_rtm_getroute() - use new style struct initializer instead of memset
From: Maciej Żenczykowski <[email protected]>
--- net/ipv4/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv4/route.c +1 -2
@@ -2780,7 +2780,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,struct rtable *rt =NULL ;struct sk_buff *skb;struct rtmsg *rtm; -struct flowi4 fl4; +struct flowi4 fl4 = {};__be32 dst =0 ;__be32 src =0 ;kuid_t uid;
@@ -2820,7 +2820,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,if (!skb)return -ENOBUFS ; -memset (&fl4,0 ,sizeof (fl4)); fl4.daddr = dst; fl4.saddr = src; fl4.flowi4_tos = rtm->rtm_tos;
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 2/9] net: inet_rtm_getroute() - use new style struct initializer instead of memset
Quoted 7 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv4/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
PATCH v2 3/9 net: ip6_redirect() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv6/route.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
net/ipv6/route.c +9 -10
@@ -2508,16 +2508,15 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, {const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;struct dst_entry *dst; -struct flowi6 fl6; - -memset (&fl6,0 ,sizeof (fl6)); - fl6.flowi6_iif =LOOPBACK_IFINDEX ; - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark; - fl6.daddr = iph->daddr; - fl6.saddr = iph->saddr; - fl6.flowlabel =ip6_flowinfo (iph); - fl6.flowi6_uid = uid; +struct flowi6 fl6 = { + .flowi6_iif =LOOPBACK_IFINDEX , + .flowi6_oif = oif, + .flowi6_mark = mark, + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowlabel =ip6_flowinfo (iph), + .flowi6_uid = uid, + }; dst =ip6_route_redirect (net, &fl6, skb, &ipv6_hdr (skb)->saddr);rt6_do_redirect (dst,NULL , skb);
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 3/9] net: ip6_redirect() - use new style struct initializer instead of memset
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
PATCH v2 4/9 net: ip6_redirect_no_header() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
net/ipv6/route.c +8 -9
@@ -2530,15 +2530,14 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,const struct ipv6hdr *iph =ipv6_hdr (skb);const struct rd_msg *msg = (struct rd_msg *)icmp6_hdr (skb);struct dst_entry *dst; -struct flowi6 fl6; - -memset (&fl6,0 ,sizeof (fl6)); - fl6.flowi6_iif =LOOPBACK_IFINDEX ; - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark; - fl6.daddr = msg->dest; - fl6.saddr = iph->daddr; - fl6.flowi6_uid =sock_net_uid (net,NULL ); +struct flowi6 fl6 = { + .flowi6_iif =LOOPBACK_IFINDEX , + .flowi6_oif = oif, + .flowi6_mark = mark, + .daddr = msg->dest, + .saddr = iph->daddr, + .flowi6_uid =sock_net_uid (net,NULL ), + }; dst =ip6_route_redirect (net, &fl6, skb, &iph->saddr);rt6_do_redirect (dst,NULL , skb);
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 4/9] net: ip6_redirect_no_header() - use new style struct initializer instead of memset
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
PATCH v2 5/9 net: remove 1 always zero parameter from ip6_redirect_no_header()
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(the parameter in question is mark)
--- include/net/ip6_route.h | 3 +-- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-)
include/net/ip6_route.h +1 -2
@@ -165,8 +165,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, int oif,void ip6_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,__be32 mtu);void ip6_redirect (struct sk_buff *skb,struct net *net,int oif,u32 mark,kuid_t uid); -void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, -u32 mark); +void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif);void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk);struct netlink_callback ;
net/ipv6/ndisc.c +1 -1
@@ -1533,7 +1533,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)if (!ndopts.nd_opts_rh) {ip6_redirect_no_header (skb,dev_net (skb->dev), - skb->dev->ifindex,0 ); + skb->dev->ifindex);return ; }
net/ipv6/route.c +1 -3
@@ -2524,8 +2524,7 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, }EXPORT_SYMBOL_GPL (ip6_redirect); -void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif, -u32 mark) +void ip6_redirect_no_header (struct sk_buff *skb,struct net *net,int oif) {const struct ipv6hdr *iph =ipv6_hdr (skb);const struct rd_msg *msg = (struct rd_msg *)icmp6_hdr (skb);
@@ -2533,7 +2532,6 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,struct flowi6 fl6 = { .flowi6_iif =LOOPBACK_IFINDEX , .flowi6_oif = oif, - .flowi6_mark = mark, .daddr = msg->dest, .saddr = iph->daddr, .flowi6_uid =sock_net_uid (net,NULL ),
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 5/9] net: remove 1 always zero parameter from ip6_redirect_no_header()
Quoted 11 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(the parameter in question is mark)
Signed-off-by Maciej Żenczykowski <[email protected]>--- include/net/ip6_route.h | 3 +-- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-)
PATCH v2 6/9 net: ip6_update_pmtu() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
net/ipv6/route.c +8 -9
@@ -2349,15 +2349,14 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, {const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;struct dst_entry *dst; -struct flowi6 fl6; - -memset (&fl6,0 ,sizeof (fl6)); - fl6.flowi6_oif = oif; - fl6.flowi6_mark = mark ? mark :IP6_REPLY_MARK (net, skb->mark); - fl6.daddr = iph->daddr; - fl6.saddr = iph->saddr; - fl6.flowlabel =ip6_flowinfo (iph); - fl6.flowi6_uid = uid; +struct flowi6 fl6 = { + .flowi6_oif = oif, + .flowi6_mark = mark ? mark :IP6_REPLY_MARK (net, skb->mark), + .daddr = iph->daddr, + .saddr = iph->saddr, + .flowlabel =ip6_flowinfo (iph), + .flowi6_uid = uid, + }; dst =ip6_route_output (net,NULL , &fl6);if (!dst->error)
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 6/9] net: ip6_update_pmtu() - use new style struct initializer instead of memset
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
PATCH v2 7/9 net: rtmsg_to_fib6_config() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv6/route.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
net/ipv6/route.c +16 -16
@@ -3604,23 +3604,23 @@ static void rtmsg_to_fib6_config(struct net *net,struct in6_rtmsg *rtmsg, struct fib6_config *cfg) { - memset(cfg, 0, sizeof(*cfg)); + *cfg = (struct fib6_config ){ + .fc_table =l3mdev_fib_table_by_index (net, rtmsg->rtmsg_ifindex) ? + :RT6_TABLE_MAIN , + .fc_ifindex = rtmsg->rtmsg_ifindex, + .fc_metric = rtmsg->rtmsg_metric, + .fc_expires = rtmsg->rtmsg_info, + .fc_dst_len = rtmsg->rtmsg_dst_len, + .fc_src_len = rtmsg->rtmsg_src_len, + .fc_flags = rtmsg->rtmsg_flags, + .fc_type = rtmsg->rtmsg_type, + + .fc_nlinfo.nl_net = net, - cfg->fc_table =l3mdev_fib_table_by_index (net, rtmsg->rtmsg_ifindex) ? - :RT6_TABLE_MAIN ; - cfg->fc_ifindex = rtmsg->rtmsg_ifindex; - cfg->fc_metric = rtmsg->rtmsg_metric; - cfg->fc_expires = rtmsg->rtmsg_info; - cfg->fc_dst_len = rtmsg->rtmsg_dst_len; - cfg->fc_src_len = rtmsg->rtmsg_src_len; - cfg->fc_flags = rtmsg->rtmsg_flags; - cfg->fc_type = rtmsg->rtmsg_type; - - cfg->fc_nlinfo.nl_net = net; - - cfg->fc_dst = rtmsg->rtmsg_dst; - cfg->fc_src = rtmsg->rtmsg_src; - cfg->fc_gateway = rtmsg->rtmsg_gateway; + .fc_dst = rtmsg->rtmsg_dst, + .fc_src = rtmsg->rtmsg_src, + .fc_gateway = rtmsg->rtmsg_gateway, + }; }int ipv6_route_ioctl (struct net *net,unsigned int cmd,void __user *arg)
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 7/9] net: rtmsg_to_fib6_config() - use new style struct initializer instead of memset
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
PATCH v2 8/9 net: rtm_to_fib6_config() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
--- net/ipv6/route.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
net/ipv6/route.c +12 -11
@@ -4143,14 +4143,19 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, err = -EINVAL ; rtm =nlmsg_data (nlh); -memset (cfg,0 ,sizeof (*cfg)); - cfg->fc_table = rtm->rtm_table; - cfg->fc_dst_len = rtm->rtm_dst_len; - cfg->fc_src_len = rtm->rtm_src_len; - cfg->fc_flags =RTF_UP ; - cfg->fc_protocol = rtm->rtm_protocol; - cfg->fc_type = rtm->rtm_type; + *cfg = (struct fib6_config ){ + .fc_table = rtm->rtm_table, + .fc_dst_len = rtm->rtm_dst_len, + .fc_src_len = rtm->rtm_src_len, + .fc_flags =RTF_UP , + .fc_protocol = rtm->rtm_protocol, + .fc_type = rtm->rtm_type, + + .fc_nlinfo.portid =NETLINK_CB (skb).portid, + .fc_nlinfo.nlh = nlh, + .fc_nlinfo.nl_net =sock_net (skb->sk), + }; if (rtm->rtm_type == RTN_UNREACHABLE || rtm->rtm_type == RTN_BLACKHOLE ||
@@ -4166,10 +4171,6 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, cfg->fc_flags |= (rtm->rtm_flags &RTNH_F_ONLINK ); - cfg->fc_nlinfo.portid =NETLINK_CB (skb).portid; - cfg->fc_nlinfo.nlh = nlh; - cfg->fc_nlinfo.nl_net =sock_net (skb->sk); -if (tb[RTA_GATEWAY ]) { cfg->fc_gateway =nla_get_in6_addr (tb[RTA_GATEWAY ]); cfg->fc_flags |=RTF_GATEWAY ;
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 8/9] net: rtm_to_fib6_config() - use new style struct initializer instead of memset
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
PATCH v2 9/9 net: inet6_rtm_getroute() - use new style struct initializer instead of memset
In reply to Maciej ŻenczykowskiFrom: Maciej Żenczykowski <[email protected]>
--- net/ipv6/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv6/route.c +1 -2
@@ -4823,7 +4823,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,struct rt6_info *rt;struct sk_buff *skb;struct rtmsg *rtm; -struct flowi6 fl6; +struct flowi6 fl6 = {};bool fibmatch; err = nlmsg_parse(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy,
@@ -4832,7 +4832,6 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, goto errout; err = -EINVAL ; -memset (&fl6,0 ,sizeof (fl6)); rtm =nlmsg_data (nlh); fl6.flowlabel =ip6_make_flowinfo (rtm->rtm_tos,0 ); fibmatch = !!(rtm->rtm_flags &RTM_F_FIB_MATCH );
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH v2 9/9] net: inet6_rtm_getroute() - use new style struct initializer instead of memset
Quoted 7 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv6/route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 9 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
(allows for better compiler optimization)
Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv4/route.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
David Miller
maintainerAll 9 patches applied, thanks.
Please provide a proper "0/N" header posting in furture patch series submissions.
Thank you.
Quoted 4 lines
Please provide a proper "0/N" header posting in furture patch series submissions.
Thank you.
Seeing as all but 2 of these patches were entirely independent should I have sent them as individual patches instead (with one patch pair)?
Or are series preferred even if I ended up reuploading 9 of 11 with no changes after the NAK on the two in v1?
Thanks,
Maciej
David Miller
maintainerFrom: Maciej Żenczykowski <[email protected]>
Date: Tue, 2 Oct 2018 16:25:39 -0700
Quoted 7 lines
Quoted 4 lines
Please provide a proper "0/N" header posting in furture patch series submissions.
Thank you.
Seeing as all but 2 of these patches were entirely independent should I have sent them as individual patches instead (with one patch pair)?
They are logically related, so a series is best in this case.