diff options
| author | Pedro Tammela <pctammela@mojatatu.com> | 2023-12-08 16:28:44 -0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-12-11 18:52:57 -0800 |
| commit | c73724bfde0932cb0cafff2855e8ce81e12fd594 (patch) | |
| tree | 146531d6d837bb164fea5d3631e0a4d824c0bcf6 | |
| parent | ddb6b284bdc32b6e218b3d90b5a745ea26620812 (diff) | |
| download | linux-stable-c73724bfde0932cb0cafff2855e8ce81e12fd594.tar.gz linux-stable-c73724bfde0932cb0cafff2855e8ce81e12fd594.tar.bz2 linux-stable-c73724bfde0932cb0cafff2855e8ce81e12fd594.zip | |
net/sched: act_api: don't open code max()
Use max() in a couple of places that are open coding it with the
ternary operator.
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20231208192847.714940-5-pctammela@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/sched/act_api.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index abec5c45b5a4..4f295ae4e152 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1796,8 +1796,7 @@ tcf_reoffload_del_notify(struct net *net, struct tc_action *action) struct sk_buff *skb; int ret; - skb = alloc_skb(attr_size <= NLMSG_GOODSIZE ? NLMSG_GOODSIZE : attr_size, - GFP_KERNEL); + skb = alloc_skb(max(attr_size, NLMSG_GOODSIZE), GFP_KERNEL); if (!skb) return -ENOBUFS; @@ -1882,8 +1881,7 @@ tcf_del_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], int ret; struct sk_buff *skb; - skb = alloc_skb(attr_size <= NLMSG_GOODSIZE ? NLMSG_GOODSIZE : attr_size, - GFP_KERNEL); + skb = alloc_skb(max(attr_size, NLMSG_GOODSIZE), GFP_KERNEL); if (!skb) return -ENOBUFS; @@ -1961,8 +1959,7 @@ tcf_add_notify(struct net *net, struct nlmsghdr *n, struct tc_action *actions[], { struct sk_buff *skb; - skb = alloc_skb(attr_size <= NLMSG_GOODSIZE ? NLMSG_GOODSIZE : attr_size, - GFP_KERNEL); + skb = alloc_skb(max(attr_size, NLMSG_GOODSIZE), GFP_KERNEL); if (!skb) return -ENOBUFS; |