mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-04 21:31:51 +00:00
genetlink: add and use genl_set_err()
Add a static inline to generic netlink to wrap netlink_set_err() to make it easier to use here - use it in openvswitch (the only generic netlink user of netlink_set_err()). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c2ebb90846
commit
62b68e99fa
3 changed files with 21 additions and 7 deletions
|
@ -879,8 +879,8 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
|
|||
if (!IS_ERR(reply))
|
||||
ovs_notify(reply, info, &ovs_dp_flow_multicast_group);
|
||||
else
|
||||
netlink_set_err(sock_net(skb->sk)->genl_sock, 0,
|
||||
ovs_dp_flow_multicast_group.id, PTR_ERR(reply));
|
||||
genl_set_err(sock_net(skb->sk), 0,
|
||||
ovs_dp_flow_multicast_group.id, PTR_ERR(reply));
|
||||
return 0;
|
||||
|
||||
err_flow_free:
|
||||
|
@ -1326,8 +1326,8 @@ static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
|||
info->snd_seq, OVS_DP_CMD_NEW);
|
||||
if (IS_ERR(reply)) {
|
||||
err = PTR_ERR(reply);
|
||||
netlink_set_err(sock_net(skb->sk)->genl_sock, 0,
|
||||
ovs_dp_datapath_multicast_group.id, err);
|
||||
genl_set_err(sock_net(skb->sk), 0,
|
||||
ovs_dp_datapath_multicast_group.id, err);
|
||||
err = 0;
|
||||
goto unlock;
|
||||
}
|
||||
|
|
|
@ -34,9 +34,9 @@ static void dp_detach_port_notify(struct vport *vport)
|
|||
OVS_VPORT_CMD_DEL);
|
||||
ovs_dp_detach_port(vport);
|
||||
if (IS_ERR(notify)) {
|
||||
netlink_set_err(ovs_dp_get_net(dp)->genl_sock, 0,
|
||||
ovs_dp_vport_multicast_group.id,
|
||||
PTR_ERR(notify));
|
||||
genl_set_err(ovs_dp_get_net(dp), 0,
|
||||
ovs_dp_vport_multicast_group.id,
|
||||
PTR_ERR(notify));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue