From patchwork Tue Oct 9 14:27:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Haakon Bugge X-Patchwork-Id: 981313 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="nkRYL9X5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42V02L4cc4z9s8F for ; Wed, 10 Oct 2018 01:28:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726703AbeJIVpD (ORCPT ); Tue, 9 Oct 2018 17:45:03 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:36204 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbeJIVpD (ORCPT ); Tue, 9 Oct 2018 17:45:03 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w99ER0UN146007; Tue, 9 Oct 2018 14:27:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=0L10St+lienYN6LhonwsS65SroB5R3YqXBF6JDo9OGE=; b=nkRYL9X5MLFgMkww/ttqnk4MmlQ+2bY65YLgIFwd6+DNZSd8IxMPBn/6hFek3HIO4jUB dA+zcMLLUu1wpwBWeX+1EkZt0wqvmMoIMTrlH47okaosd/lrP8fgKLQLIc7ML1i24s2P AKncCG2J3r4mT+FCS2nuiwVi+Xrk1hk3mMkStEDLgmFTeO3N7YFvYdk366KqL6I80Yiy zAMy0pPaac/g5/C6LGzp84UGda+0nuAsKaM7IsMbhi6qGHJq3Yyq/kSP1edauNcPx94u UWTDAxdeu6LXcSkWyu9qele5vyQDKEk7YKx+CjcJT/Mp1kzAirQJOozq0TUCt22uMgdb sw== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2mxnpqwjkf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Oct 2018 14:27:41 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w99ERZ7S013725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Oct 2018 14:27:35 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w99ERYNB014920; Tue, 9 Oct 2018 14:27:34 GMT Received: from lab02.no.oracle.com (/10.172.144.56) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 09 Oct 2018 14:27:34 +0000 From: =?utf-8?q?H=C3=A5kon_Bugge?= To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, "David S . Miller" , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Philippe Ombredanne , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] net: if_arp: Fix incorrect indents Date: Tue, 9 Oct 2018 16:27:23 +0200 Message-Id: <20181009142724.2213012-2-Haakon.Bugge@oracle.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20181009142724.2213012-1-Haakon.Bugge@oracle.com> References: <20181009142724.2213012-1-Haakon.Bugge@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9040 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=571 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810090142 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixing incorrect indents and align comments. Signed-off-by: Håkon Bugge --- include/uapi/linux/if_arp.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h index 4605527ca41b..b68b4b3d9172 100644 --- a/include/uapi/linux/if_arp.h +++ b/include/uapi/linux/if_arp.h @@ -114,18 +114,18 @@ /* ARP ioctl request. */ struct arpreq { - struct sockaddr arp_pa; /* protocol address */ - struct sockaddr arp_ha; /* hardware address */ - int arp_flags; /* flags */ - struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ - char arp_dev[16]; + struct sockaddr arp_pa; /* protocol address */ + struct sockaddr arp_ha; /* hardware address */ + int arp_flags; /* flags */ + struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ + char arp_dev[16]; }; struct arpreq_old { - struct sockaddr arp_pa; /* protocol address */ - struct sockaddr arp_ha; /* hardware address */ - int arp_flags; /* flags */ - struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ + struct sockaddr arp_pa; /* protocol address */ + struct sockaddr arp_ha; /* hardware address */ + int arp_flags; /* flags */ + struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ }; /* ARP Flag values. */ From patchwork Tue Oct 9 14:27:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Haakon Bugge X-Patchwork-Id: 981312 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="oFuSkNWI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42V02F4RBxz9s8r for ; Wed, 10 Oct 2018 01:28:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726723AbeJIVpE (ORCPT ); Tue, 9 Oct 2018 17:45:04 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:39490 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726663AbeJIVpD (ORCPT ); Tue, 9 Oct 2018 17:45:03 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w99ERZT5183070; Tue, 9 Oct 2018 14:27:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=szqIYAdIyT0GpUL2dyMKu4SbCLSsnAk/u7zaUcvIa6Q=; b=oFuSkNWIs7vI3Koz6Z2yLzJJIR7AN2DVgygOgp3fk09tHU09mdSgmW/W5aWKl/PFuQ0i rt6c8AXc/eMqM8U1RA+6hiiVfVcltEjAcMWNV36AigoLQyliGfNpCBPrV1OcZiQQrXV+ p1WtY9MG9yzTSytj5q6DuArzMhr26OlyYvRT1dXeNRnMOQbHA7rD/8N+t94PyZuLHaG/ uQuXV1KXu2p781AAtz5yON85RM/LuTIHuTM2GtCcV0JcMkg63QzEzGoMgR3GRjFQExGB eHJttmDkmhmj+ykEwemtyqlrJSPQWgl4GikC7qkQrbZsbtv6+hsTYnrRO/rG776g41pW 4A== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2mxmftnrr2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Oct 2018 14:27:38 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w99ERbvv004314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Oct 2018 14:27:37 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w99ERaXT007545; Tue, 9 Oct 2018 14:27:36 GMT Received: from lab02.no.oracle.com (/10.172.144.56) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 09 Oct 2018 14:27:36 +0000 From: =?utf-8?q?H=C3=A5kon_Bugge?= To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, "David S . Miller" , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Philippe Ombredanne , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] net: if_arp: use define instead of hard-coded value Date: Tue, 9 Oct 2018 16:27:24 +0200 Message-Id: <20181009142724.2213012-3-Haakon.Bugge@oracle.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20181009142724.2213012-1-Haakon.Bugge@oracle.com> References: <20181009142724.2213012-1-Haakon.Bugge@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9040 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=423 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810090142 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Let uapi/linux/if_arp.h include uapi/linux/if.h, where IFNAMSIZ is defined. Then, use it in this file instead of hard-coded value. This way, we are using an uapi defined constant, and as such, user-space should be good. Signed-off-by: Håkon Bugge Tested-by: Stephen Hemminger --- v1 -> v2: * Include uapi/linux/if.h * Add Stephen's t-b --- include/uapi/linux/if_arp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h index b68b4b3d9172..f5d2dab3f610 100644 --- a/include/uapi/linux/if_arp.h +++ b/include/uapi/linux/if_arp.h @@ -24,6 +24,7 @@ #ifndef _UAPI_LINUX_IF_ARP_H #define _UAPI_LINUX_IF_ARP_H +#include #include /* ARP protocol HARDWARE identifiers. */ @@ -118,7 +119,7 @@ struct arpreq { struct sockaddr arp_ha; /* hardware address */ int arp_flags; /* flags */ struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ - char arp_dev[16]; + char arp_dev[IFNAMSIZ]; }; struct arpreq_old {