From patchwork Thu Jan 31 16:27:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 1034370 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=none (p=none dis=none) header.from=g.ncu.edu.tw Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=g.ncu.edu.tw header.i=@g.ncu.edu.tw header.b="hLIJs3kO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43r5H44FnVz9sBb for ; Fri, 1 Feb 2019 03:27:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388270AbfAaQ1K (ORCPT ); Thu, 31 Jan 2019 11:27:10 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37776 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731284AbfAaQ1K (ORCPT ); Thu, 31 Jan 2019 11:27:10 -0500 Received: by mail-pg1-f195.google.com with SMTP id c25so1568651pgb.4 for ; Thu, 31 Jan 2019 08:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=g.ncu.edu.tw; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gIq6NA+re8g/Tob/FEDctWn3nGOEFUquxHcBYrHkrjY=; b=hLIJs3kORNEH1715FLFcvOIjdzsVsYFIlVLwx5fJNB2eCaQu1Ktzo0EMBKSx+qg7J+ jElC0qra7Wyi3weSFRNWlsQq/tIK8mMbXnsou6u+P5T/2cqM8wlVyQXfg3ZOqujx2r6N w7bRqqRbmQ9f60UkfjytcghsPtSgGweGExY4g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gIq6NA+re8g/Tob/FEDctWn3nGOEFUquxHcBYrHkrjY=; b=N1WCOh3pHVWWcn+SCdQE6dM4X5iMYxZ7m/e9r+IE+VgpeoxlQHsU/OGMuApgGwQr5m BEzfpzxEkLS8JLZ7zUh03CU8U60kZcStLo664LS6N8XSrwKEpCLQyIoUKtSoXsRj97GH cIRqkNk245bk1IEyYGg0XaLSSSzuh3gwCGualJEGuTT9/anbHyqrx+nD+CmRLPBxYWIm neRB7eQ4slwS+HLBCsVGednVRQ6j094DGNW+bUPSPiMJS733tRy4qOFh0YmS8P1hGh4m 7zhBsMBYJv6O4RL0jRIHb+DyngYwJqfgYKyZrX5k+kmm5ToGcWK42H+0v9L/aXZU7NBh NBEw== X-Gm-Message-State: AJcUukc1yBU5jfSBh8GKBQVnrm/IcpQKfcrZFjamr1orQN+e9UW+DDLP HlbIRFE7MVM3F+94FVyf5p+X10oco6XKnw== X-Google-Smtp-Source: ALg8bN4UexN/GssJjAfssCxAoOn+hgy78W2/dbZvybLREjF6YFeDaS5vSTSoNGq4ujeQBvfrk3RWEg== X-Received: by 2002:a62:178f:: with SMTP id 137mr35115817pfx.226.1548952029469; Thu, 31 Jan 2019 08:27:09 -0800 (PST) Received: from starnight.local ([150.116.255.181]) by smtp.gmail.com with ESMTPSA id 62sm5512878pgc.61.2019.01.31.08.27.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 08:27:09 -0800 (PST) From: Jian-Hong Pan To: =?utf-8?q?Andreas_F=C3=A4rber?= Cc: netdev@vger.kernel.org, linux-lpwan@lists.infradead.org, Ben Whitten , Jian-Hong Pan Subject: [RFC PATCH v2 1/5] net: lorawan: Refine the coding style Date: Fri, 1 Feb 2019 00:27:16 +0800 Message-Id: <20190131162715.18484-1-starnight@g.ncu.edu.tw> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131162101.18386-1-starnight@g.ncu.edu.tw> References: <20190131162101.18386-1-starnight@g.ncu.edu.tw> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the coding style. Fixes: 48e5bb6cec79 ("net: Prepare LoRaWAN socket module") Signed-off-by: Jian-Hong Pan --- v2: - Modify the commit message - Order the included header files include/linux/lora/lorawan_netdev.h | 5 ++-- net/lorawan/socket.c | 45 ++++++++++++++--------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/include/linux/lora/lorawan_netdev.h b/include/linux/lora/lorawan_netdev.h index 5bffb5164f95..a6c94cb96bf4 100644 --- a/include/linux/lora/lorawan_netdev.h +++ b/include/linux/lora/lorawan_netdev.h @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ -/*- +/* * LoRaWAN stack related definitions * - * Copyright (c) 2018 Jian-Hong, Pan - * + * Copyright (c) 2018 Jian-Hong Pan */ #ifndef __LORAWAN_NET_DEVICE_H__ diff --git a/net/lorawan/socket.c b/net/lorawan/socket.c index 7ef106b877ca..31a77c3e5ee9 100644 --- a/net/lorawan/socket.c +++ b/net/lorawan/socket.c @@ -1,36 +1,33 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause -/*- +/* * LoRaWAN stack related definitions * - * Copyright (c) 2018 Jian-Hong, Pan - * + * Copyright (c) 2018 Jian-Hong Pan */ #define LORAWAN_MODULE_NAME "lorawan" #define pr_fmt(fmt) LORAWAN_MODULE_NAME ": " fmt +#include #include -#include #include +#include +#include #include -#include #include /* For TIOCOUTQ/INQ */ #include -#include /** * dgram_sock - This structure holds the states of Datagram socket * * @sk: network layer representation of the socket - * sk must be the first member of dgram_sock * @src_devaddr: the LoRaWAN device address for this connection * @bound: this socket is bound or not * @connected: this socket is connected to the destination or not - * @want_ack: this socket needs to ack for the connection or not */ struct dgram_sock { - struct sock sk; + struct sock sk; /* sk must be the first member of dgram_sock */ u32 src_devaddr; u8 bound:1; @@ -136,7 +133,7 @@ dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) size_t tlen; int ret; - pr_debug("%s: going to send %zu bytes", __func__, size); + pr_debug("%s: going to send %zu bytes\n", __func__, size); if (msg->msg_flags & MSG_OOB) { pr_debug("msg->msg_flags = 0x%x\n", msg->msg_flags); return -EOPNOTSUPP; @@ -532,7 +529,7 @@ static const struct proto_ops lrw_dgram_ops = { }; static int -lorawan_creat(struct net *net, struct socket *sock, int protocol, int kern) +lrw_create(struct net *net, struct socket *sock, int protocol, int kern) { struct sock *sk; int ret; @@ -557,7 +554,7 @@ lorawan_creat(struct net *net, struct socket *sock, int protocol, int kern) ret = sk->sk_prot->hash(sk); if (ret) { sk_common_release(sk); - goto lorawan_creat_end; + goto lrw_create_end; } } @@ -567,14 +564,14 @@ lorawan_creat(struct net *net, struct socket *sock, int protocol, int kern) sk_common_release(sk); } -lorawan_creat_end: +lrw_create_end: return ret; } static const struct net_proto_family lorawan_family_ops = { .owner = THIS_MODULE, .family = PF_LORAWAN, - .create = lorawan_creat, + .create = lrw_create, }; static int @@ -617,29 +614,29 @@ lrw_dgram_deliver(struct net_device *ndev, struct sk_buff *skb) } static int -lorawan_rcv(struct sk_buff *skb, struct net_device *ndev, - struct packet_type *pt, struct net_device *orig_ndev) +lrw_rcv(struct sk_buff *skb, struct net_device *ndev, + struct packet_type *pt, struct net_device *orig_ndev) { if (!netif_running(ndev)) - goto lorawan_rcv_drop; + goto lrw_rcv_drop; if (!net_eq(dev_net(ndev), &init_net)) - goto lorawan_rcv_drop; + goto lrw_rcv_drop; if (ndev->type != ARPHRD_LORAWAN) - goto lorawan_rcv_drop; + goto lrw_rcv_drop; if (skb->pkt_type != PACKET_OTHERHOST) return lrw_dgram_deliver(ndev, skb); -lorawan_rcv_drop: +lrw_rcv_drop: kfree_skb(skb); return NET_RX_DROP; } static struct packet_type lorawan_packet_type = { .type = htons(ETH_P_LORAWAN), - .func = lorawan_rcv, + .func = lrw_rcv, }; static int __init @@ -665,7 +662,7 @@ lrw_sock_init(void) proto_unregister(&lrw_dgram_prot); lrw_sock_init_end: - return 0; + return ret; } static void __exit @@ -680,7 +677,7 @@ lrw_sock_exit(void) module_init(lrw_sock_init); module_exit(lrw_sock_exit); -MODULE_AUTHOR("Jian-Hong Pan, "); -MODULE_DESCRIPTION("LoRaWAN socket kernel module"); +MODULE_AUTHOR("Jian-Hong Pan "); +MODULE_DESCRIPTION("LoRaWAN socket protocol"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_ALIAS_NETPROTO(PF_LORAWAN);