From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 742E2C282F6 for ; Mon, 21 Jan 2019 09:53:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4202D2084A for ; Mon, 21 Jan 2019 09:53:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="2RNOwAZ3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727920AbfAUJxS (ORCPT ); Mon, 21 Jan 2019 04:53:18 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46937 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbfAUJxR (ORCPT ); Mon, 21 Jan 2019 04:53:17 -0500 Received: by mail-wr1-f66.google.com with SMTP id l9so22443339wrt.13 for ; Mon, 21 Jan 2019 01:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=bt34qgbPziF65IrxAWYqLkf3Ays+b0gBjcP2MNJwF/0=; b=2RNOwAZ3nclclKmO+KoZmMAKH15QJlc/U0ttxyJ3Bsy910eKXxc+kfwxU6GEnSRlzT vX1642wSwY1DR1zk4Qkcwec9iNHnEX09GqB9w4aYWq3FByeJQXIJYnCinnEg+RkX+0dT Xsb1pyBEmY+cgMZuWn6aL7LE3lspoOn+ub0aGW61p1d/fsAT0MbOIyxDkPl9U9Hk/4n4 mvXNgoaXnHQcTkSlkoir7K98d8UOeXV5ZAf7vR8XzJCgMXOBa/97tBh1vb4MWtFwp92T ACC8xBdVnPSw1nPAPOP9n3rqu8MCR6drVt5V9hWEjKXceVH4dJVMMftBU/g385Cx9fVu +9Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=bt34qgbPziF65IrxAWYqLkf3Ays+b0gBjcP2MNJwF/0=; b=GO5ba7L/fUMR7tt2jBFvJFDxh8u5CJ85+NyXPmJWbM3DCE90917nD6FnI8lVonfZbf eKfWMYA42gQRWIRYQiRpmMYUBDSSK7iCfiSu6zO9o3fUg7EO11us89mR6CKzOj9c2Ab7 cWm5nWFUnjGMaKZsNwaGFduE8YnkTcmz1IT+At7YOpCyeduNlM+JBAwFywDio4dl05mh m2ny9co7fa/76nVFVVNZFWbuqA+RkhOTepVSTRieph6eAmVVr6EpUvqiLaHWQgtHibqv KeukwBYrgUl9DhOcXLyzRir1NBlcYWZaaTabjx3AfA6pPHYaYZxXH6A6+S1IH6vnc2Yf C5Rg== X-Gm-Message-State: AJcUukd5rR9DMO9+48cPNW/Lp7edplPZM6lzK4M05Q8s0zij+OCO9Nla GWosMldCxfk82d01rsoBD6UeJA== X-Google-Smtp-Source: ALg8bN6vUTW3ErSpZB6W0f28ds4gCAvz/mEGElkE9dssGWwIq7xO5uHkCFz+ZfxlvmknXRw+xlXn8w== X-Received: by 2002:adf:d4c9:: with SMTP id w9mr27261897wrk.119.1548064395915; Mon, 21 Jan 2019 01:53:15 -0800 (PST) Received: from localhost ([193.47.165.251]) by smtp.gmail.com with ESMTPSA id r3sm77782286wrs.78.2019.01.21.01.53.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jan 2019 01:53:15 -0800 (PST) Date: Mon, 21 Jan 2019 10:44:30 +0100 From: Jiri Pirko To: Sven Eckelmann Cc: b.a.t.m.a.n@lists.open-mesh.org, Jiri Pirko , netdev@vger.kernel.org Subject: Re: [RFC v4 04/19] batman-adv: Prepare framework for vlan genl config Message-ID: <20190121094430.GC2228@nanopsycho> References: <20190119155626.6414-1-sven@narfation.org> <20190119155626.6414-5-sven@narfation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190119155626.6414-5-sven@narfation.org> User-Agent: Mutt/1.9.5 (2018-04-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sat, Jan 19, 2019 at 04:56:11PM CET, sven@narfation.org wrote: [...] >+/** >+ * batadv_netlink_vlan_put() - Fill message with vlan attributes >+ * @msg: Netlink message to dump into >+ * @bat_priv: the bat priv with all the soft interface information >+ * @vlan: vlan which was modified >+ * @cmd: type of message to generate >+ * @portid: Port making netlink request >+ * @seq: sequence number for message >+ * @flags: Additional flags for message >+ * >+ * Return: 0 on success or negative error number in case of failure >+ */ >+static int batadv_netlink_vlan_put(struct sk_buff *msg, >+ struct batadv_priv *bat_priv, >+ struct batadv_softif_vlan *vlan, >+ enum batadv_nl_commands cmd, >+ u32 portid, u32 seq, int flags) >+{ >+ void *hdr; >+ >+ hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, flags, cmd); >+ if (!hdr) >+ return -ENOBUFS; >+ >+ if (nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, >+ bat_priv->soft_iface->ifindex)) >+ goto nla_put_failure; >+ >+ if (nla_put_u32(msg, BATADV_ATTR_VLANID, vlan->vid & VLAN_VID_MASK)) >+ goto nla_put_failure; >+ >+ genlmsg_end(msg, hdr); >+ return 0; >+ >+nla_put_failure: >+ genlmsg_cancel(msg, hdr); >+ return -EMSGSIZE; >+} >+ >+/** >+ * batadv_netlink_notify_vlan() - send vlan attributes to listener >+ * @bat_priv: the bat priv with all the soft interface information >+ * @vlan: vlan which was modified >+ * >+ * Return: 0 on success, < 0 on error >+ */ >+static int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, >+ struct batadv_softif_vlan *vlan) >+{ >+ struct sk_buff *msg; >+ int ret; >+ >+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); >+ if (!msg) >+ return -ENOMEM; >+ >+ ret = batadv_netlink_vlan_put(msg, bat_priv, vlan, >+ BATADV_CMD_SET_VLAN, 0, 0, 0); >+ if (ret < 0) { >+ nlmsg_free(msg); >+ return ret; >+ } >+ >+ genlmsg_multicast_netns(&batadv_netlink_family, >+ dev_net(bat_priv->soft_iface), msg, 0, >+ BATADV_NL_MCGRP_CONFIG, GFP_KERNEL); >+ >+ return 0; >+} >+ >+/** >+ * batadv_netlink_get_vlan() - Get vlan attributes >+ * @skb: Netlink message with request data >+ * @info: receiver information >+ * >+ * Return: 0 on success or negative error number in case of failure >+ */ >+static int batadv_netlink_get_vlan(struct sk_buff *skb, struct genl_info *info) >+{ >+ struct batadv_softif_vlan *vlan = info->user_ptr[1]; >+ struct batadv_priv *bat_priv = info->user_ptr[0]; >+ struct sk_buff *msg; >+ int ret; >+ >+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); >+ if (!msg) >+ return -ENOMEM; >+ >+ ret = batadv_netlink_vlan_put(msg, bat_priv, vlan, BATADV_CMD_GET_VLAN, >+ info->snd_portid, info->snd_seq, 0); This get/put naming here looks a bit confusing. Better to use "fill" for example: ret = batadv_netlink_vlan_fill(msg, bat_priv, vlan, BATADV_CMD_GET_VLAN, info->snd_portid, info->snd_seq, 0); >+ if (ret < 0) { Just "if (!ret)" would do. Same in the rest of the code. >+ nlmsg_free(msg); >+ return ret; >+ } >+ >+ ret = genlmsg_reply(msg, info); >+ >+ return ret; >+} >+ [...] From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 21 Jan 2019 10:44:30 +0100 From: Jiri Pirko Message-ID: <20190121094430.GC2228@nanopsycho> References: <20190119155626.6414-1-sven@narfation.org> <20190119155626.6414-5-sven@narfation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190119155626.6414-5-sven@narfation.org> Subject: Re: [B.A.T.M.A.N.] [RFC v4 04/19] batman-adv: Prepare framework for vlan genl config List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sven Eckelmann Cc: b.a.t.m.a.n@lists.open-mesh.org, Jiri Pirko , netdev@vger.kernel.org Sat, Jan 19, 2019 at 04:56:11PM CET, sven@narfation.org wrote: [...] >+/** >+ * batadv_netlink_vlan_put() - Fill message with vlan attributes >+ * @msg: Netlink message to dump into >+ * @bat_priv: the bat priv with all the soft interface information >+ * @vlan: vlan which was modified >+ * @cmd: type of message to generate >+ * @portid: Port making netlink request >+ * @seq: sequence number for message >+ * @flags: Additional flags for message >+ * >+ * Return: 0 on success or negative error number in case of failure >+ */ >+static int batadv_netlink_vlan_put(struct sk_buff *msg, >+ struct batadv_priv *bat_priv, >+ struct batadv_softif_vlan *vlan, >+ enum batadv_nl_commands cmd, >+ u32 portid, u32 seq, int flags) >+{ >+ void *hdr; >+ >+ hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, flags, cmd); >+ if (!hdr) >+ return -ENOBUFS; >+ >+ if (nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, >+ bat_priv->soft_iface->ifindex)) >+ goto nla_put_failure; >+ >+ if (nla_put_u32(msg, BATADV_ATTR_VLANID, vlan->vid & VLAN_VID_MASK)) >+ goto nla_put_failure; >+ >+ genlmsg_end(msg, hdr); >+ return 0; >+ >+nla_put_failure: >+ genlmsg_cancel(msg, hdr); >+ return -EMSGSIZE; >+} >+ >+/** >+ * batadv_netlink_notify_vlan() - send vlan attributes to listener >+ * @bat_priv: the bat priv with all the soft interface information >+ * @vlan: vlan which was modified >+ * >+ * Return: 0 on success, < 0 on error >+ */ >+static int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, >+ struct batadv_softif_vlan *vlan) >+{ >+ struct sk_buff *msg; >+ int ret; >+ >+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); >+ if (!msg) >+ return -ENOMEM; >+ >+ ret = batadv_netlink_vlan_put(msg, bat_priv, vlan, >+ BATADV_CMD_SET_VLAN, 0, 0, 0); >+ if (ret < 0) { >+ nlmsg_free(msg); >+ return ret; >+ } >+ >+ genlmsg_multicast_netns(&batadv_netlink_family, >+ dev_net(bat_priv->soft_iface), msg, 0, >+ BATADV_NL_MCGRP_CONFIG, GFP_KERNEL); >+ >+ return 0; >+} >+ >+/** >+ * batadv_netlink_get_vlan() - Get vlan attributes >+ * @skb: Netlink message with request data >+ * @info: receiver information >+ * >+ * Return: 0 on success or negative error number in case of failure >+ */ >+static int batadv_netlink_get_vlan(struct sk_buff *skb, struct genl_info *info) >+{ >+ struct batadv_softif_vlan *vlan = info->user_ptr[1]; >+ struct batadv_priv *bat_priv = info->user_ptr[0]; >+ struct sk_buff *msg; >+ int ret; >+ >+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); >+ if (!msg) >+ return -ENOMEM; >+ >+ ret = batadv_netlink_vlan_put(msg, bat_priv, vlan, BATADV_CMD_GET_VLAN, >+ info->snd_portid, info->snd_seq, 0); This get/put naming here looks a bit confusing. Better to use "fill" for example: ret = batadv_netlink_vlan_fill(msg, bat_priv, vlan, BATADV_CMD_GET_VLAN, info->snd_portid, info->snd_seq, 0); >+ if (ret < 0) { Just "if (!ret)" would do. Same in the rest of the code. >+ nlmsg_free(msg); >+ return ret; >+ } >+ >+ ret = genlmsg_reply(msg, info); >+ >+ return ret; >+} >+ [...]