From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Machata Subject: [PATCH net-next 3/8] net: ipvlan: ipvlan_set_port_mode(): Add an extack argument Date: Wed, 5 Dec 2018 10:51:42 +0000 Message-ID: <509242246cdef78dd3d3fabbb0baecc48c8b488e.1544006963.git.petrm@mellanox.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: "shrijeet-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" , "heiko.carstens-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org" , "_govind-KK0ffGbhmjU@public.gmane.org" <_govind-KK0ffGbhmjU@public.gmane.org>, "dsa-qUQiAmfTcIp+XZJcv9eMoEEOCMrvLtNR@public.gmane.org" , "ecree-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org" , kys , "shuah-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" , "andy-QlMahl40kYEqcZcGjlUOXw@public.gmane.org" , "johan.hedberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" , "ioana.ciornei-3arQi8VN3Tc@public.gmane.org" , "sthemmin-0li6OtcxBFHby3iVrkZq2A@public.gmane.org" , "ruxandra.radulescu-3arQi8VN3Tc@public.gmane.org" , "jwi-tEXmvtCZX7AybS5Ee8rs3A@public.gmane.org" , "jgg-uk2M96/98Pc@public.gmane.org" , "dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" , "joabreu-HKixBCOQz3hWk0Htik3J/w@public.gmane.org" , "vfalico-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" , "kuznet-v/Mj1YrvjDBInbfyfbPRSQ@public.gmane.org" , "david.kershner-GLv8BlqOqDDQT0dZR+AlfA@public.gmane.org" , "marcel@holtma To: "linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-stm32-XDFAJ8BFU24N7RejjzZ/Li2xQDfSxrLKVpNB7YpNyf8@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "devel-tBiZLqfeLfOHmIFyCCdPziST3g8Odh+X@public.gmane.org" , "linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org" , "sparmaintainer-GLv8BlqOqDDQT0dZR+AlfA@public.gmane.org" , "linux-bluetooth-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org" , "linux-kselftest-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" Return-path: In-Reply-To: Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Errors-To: ovs-dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org List-Id: netdev.vger.kernel.org A follow-up patch will extend dev_change_flags() with an extack argument. Extend ipvlan_set_port_mode() to have that argument available for the conversion. Signed-off-by: Petr Machata Acked-by: Jiri Pirko Reviewed-by: Ido Schimmel --- drivers/net/ipvlan/ipvlan_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 4a949569ec4c..14f1cbd3b96f 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -71,7 +71,8 @@ static void ipvlan_unregister_nf_hook(struct net *net) ARRAY_SIZE(ipvl_nfops)); } -static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval) +static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval, + struct netlink_ext_ack *extack) { struct ipvl_dev *ipvlan; struct net_device *mdev = port->dev; @@ -498,7 +499,7 @@ static int ipvlan_nl_changelink(struct net_device *dev, if (data[IFLA_IPVLAN_MODE]) { u16 nmode = nla_get_u16(data[IFLA_IPVLAN_MODE]); - err = ipvlan_set_port_mode(port, nmode); + err = ipvlan_set_port_mode(port, nmode, extack); } if (!err && data[IFLA_IPVLAN_FLAGS]) { @@ -672,7 +673,7 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev, if (data && data[IFLA_IPVLAN_MODE]) mode = nla_get_u16(data[IFLA_IPVLAN_MODE]); - err = ipvlan_set_port_mode(port, mode); + err = ipvlan_set_port_mode(port, mode, extack); if (err) goto unlink_netdev; -- 2.4.11