From patchwork Mon Jul 1 17:38:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1125523 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="uEd08RMu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45cvk25njMz9sPH for ; Tue, 2 Jul 2019 03:38:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728331AbfGARiu (ORCPT ); Mon, 1 Jul 2019 13:38:50 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:55920 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727130AbfGARiu (ORCPT ); Mon, 1 Jul 2019 13:38:50 -0400 Received: by mail-pf1-f202.google.com with SMTP id i26so9179025pfo.22 for ; Mon, 01 Jul 2019 10:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=rqxRKWNEo1osvaBkv3/KPbZBsws5mfNzEZoyqO4E7N0=; b=uEd08RMuRZkIcdgl/k7/xWDXggSB7BIAEHoCC54LmnZryPZbzhb0qGfkQYyeEF9HwZ AMqishzIroKm5Q6ZnbjDIabRPPx8VE+JMMTWLGMz07nrO8urswHBugHWM3Av2/Kc0d+D M9/bVmFXXreaEKJe93mL8fUF+OaQcrCt508Zabl3UqWmQZbOJ5tgSZJLvqZFhPzlButD 1Pp4NsOtM3SYwPEd3Qgx7ioQGJzBAEJ9iX9XZr6Dvr3xVf71k7+4WMk8yuylaVRTQDP8 ErsSFS8WXPnWAy4r0G3HWfrcbSG52CuRhyx5fxEa9AoC7Fak0lTthHifpZpvLDYQ7eIF T8Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=rqxRKWNEo1osvaBkv3/KPbZBsws5mfNzEZoyqO4E7N0=; b=O4aOSK0/Yd5pjNTHX5ivRYAZiN5e6WKZvTsLt5st2NZd5ThylrUhfYajEh0fF1IxMI 9fNZenEXn1yfWwAPdqZOSMSVRYw+Cy/hlSE7sxq2//jViQ0BXd7JNaYB7j9Ol7G/3laE tP5RQgHtVc4T7ncqhAjschHZd9tTD308CQlLzkA0DTv0GZiDILb7ByUKjYx/K4XJwBcE y0UZwU0Hj1X7h6U4b5vEE14HryPMKnr6H3tW660Cvx7oTlmJqETd6vS55M2momXvvDFE /96elW2OodbeSwBGyeYd5G1xOR64cp+94MWsEDWPukK5zMJFoCv0m4tZ0MdpeE23/+oC hv9Q== X-Gm-Message-State: APjAAAXjqMRCiaUmzDefAttGGgdEsgUxdSOvUW0wJxRu1zZrVxDz+RDw UGDaLAk9glqwrxf5pDq3tCETIrA= X-Google-Smtp-Source: APXvYqxqMd81L1DDmkwA3FYZGIcQqmw1s+00/5mYjsII7gtoJsELsfFIxiFV5KROBjQf3TfZe7iPhiw= X-Received: by 2002:a65:5c0a:: with SMTP id u10mr26577468pgr.412.1562002729019; Mon, 01 Jul 2019 10:38:49 -0700 (PDT) Date: Mon, 1 Jul 2019 10:38:40 -0700 In-Reply-To: <20190701173841.32249-1-sdf@google.com> Message-Id: <20190701173841.32249-3-sdf@google.com> Mime-Version: 1.0 References: <20190701173841.32249-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v3 2/3] bpf: sync bpf.h to tools/ From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Sync user_ip6 & msg_src_ip6 comments. Signed-off-by: Stanislav Fomichev --- tools/include/uapi/linux/bpf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index a396b516a2b2..c59dc921ce83 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3237,7 +3237,7 @@ struct bpf_sock_addr { __u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 user_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 user_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __u32 user_port; /* Allows 4-byte read and write. @@ -3246,10 +3246,10 @@ struct bpf_sock_addr { __u32 family; /* Allows 4-byte read, but no write */ __u32 type; /* Allows 4-byte read, but no write */ __u32 protocol; /* Allows 4-byte read, but no write */ - __u32 msg_src_ip4; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk);