linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues
@ 2021-06-16  9:33 Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 1/8] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
                   ` (7 more replies)
  0 siblings, 8 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

This patchset clean up some code style issues.

Peng Li (8):
  net: hdlc_ppp: remove redundant blank lines
  net: hdlc_ppp: add blank line after declarations
  net: hdlc_ppp: fix the code style issue about "foo* bar"
  net: hdlc_ppp: move out assignment in if condition
  net: hdlc_ppp: fix the comments style issue
  net: hdlc_ppp: remove unnecessary out of memory message
  net: hdlc_ppp: remove redundant spaces
  net: hdlc_ppp: add required space

 drivers/net/wan/hdlc_ppp.c | 90 ++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 48 deletions(-)

-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 1/8] net: hdlc_ppp: remove redundant blank lines
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 2/8] net: hdlc_ppp: add blank line after declarations Guangbin Huang
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

This patch removes some redundant blank lines.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 261b53f..e25b2f0 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -58,7 +58,6 @@ struct cp_header {
 	__be16 len;
 };
 
-
 struct proto {
 	struct net_device *dev;
 	struct timer_list timer;
@@ -160,7 +159,6 @@ static __be16 ppp_type_trans(struct sk_buff *skb, struct net_device *dev)
 	}
 }
 
-
 static int ppp_hard_header(struct sk_buff *skb, struct net_device *dev,
 			   u16 type, const void *daddr, const void *saddr,
 			   unsigned int len)
@@ -193,7 +191,6 @@ static int ppp_hard_header(struct sk_buff *skb, struct net_device *dev,
 	return sizeof(struct hdlc_header);
 }
 
-
 static void ppp_tx_flush(void)
 {
 	struct sk_buff *skb;
@@ -256,7 +253,6 @@ static void ppp_tx_cp(struct net_device *dev, u16 pid, u8 code,
 	skb_queue_tail(&tx_queue, skb);
 }
 
-
 /* State transition table (compare STD-51)
    Events                                   Actions
    TO+  = Timeout with counter > 0          irc = Initialize-Restart-Count
@@ -294,7 +290,6 @@ static int cp_table[EVENTS][STATES] = {
 	{    0    ,      1      ,  1  ,    1    ,  1  ,    1    ,IRC|STR|2}, /* RXJ- */
 };
 
-
 /* SCA: RCR+ must supply id, len and data
    SCN: RCR- must supply code, id, len and data
    STA: RTR must supply id
@@ -369,7 +364,6 @@ static void ppp_cp_event(struct net_device *dev, u16 pid, u16 event, u8 code,
 #endif
 }
 
-
 static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id,
 			    unsigned int req_len, const u8 *data)
 {
@@ -615,7 +609,6 @@ static void ppp_timer(struct timer_list *t)
 	ppp_tx_flush();
 }
 
-
 static void ppp_start(struct net_device *dev)
 {
 	struct ppp *ppp = get_ppp(dev);
@@ -707,7 +700,6 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)
 	return -EINVAL;
 }
 
-
 static int __init mod_init(void)
 {
 	skb_queue_head_init(&tx_queue);
@@ -720,7 +712,6 @@ static void __exit mod_exit(void)
 	unregister_hdlc_protocol(&proto);
 }
 
-
 module_init(mod_init);
 module_exit(mod_exit);
 
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 2/8] net: hdlc_ppp: add blank line after declarations
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 1/8] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 3/8] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

This patch fixes the checkpatch error about missing a blank line
after declarations.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index e25b2f0..32f01d7 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -41,6 +41,7 @@ static const char *const code_names[CP_CODES] = {
 	"0", "ConfReq", "ConfAck", "ConfNak", "ConfRej", "TermReq",
 	"TermAck", "CodeRej", "ProtoRej", "EchoReq", "EchoReply", "Discard"
 };
+
 static char debug_buffer[64 + 3 * DEBUG_CP];
 #endif
 
@@ -90,6 +91,7 @@ static const char *const state_names[STATES] = {
 	"Closed", "Stopped", "Stopping", "ReqSent", "AckRecv", "AckSent",
 	"Opened"
 };
+
 static const char *const event_names[EVENTS] = {
 	"Start", "Stop", "TO+", "TO-", "RCR+", "RCR-", "RCA", "RCN",
 	"RTR", "RTA", "RUC", "RXJ+", "RXJ-"
@@ -194,6 +196,7 @@ static int ppp_hard_header(struct sk_buff *skb, struct net_device *dev,
 static void ppp_tx_flush(void)
 {
 	struct sk_buff *skb;
+
 	while ((skb = skb_dequeue(&tx_queue)) != NULL)
 		dev_queue_xmit(skb);
 }
@@ -616,6 +619,7 @@ static void ppp_start(struct net_device *dev)
 
 	for (i = 0; i < IDX_COUNT; i++) {
 		struct proto *proto = &ppp->protos[i];
+
 		proto->dev = dev;
 		timer_setup(&proto->timer, ppp_timer, 0);
 		proto->state = CLOSED;
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 3/8] net: hdlc_ppp: fix the code style issue about "foo* bar"
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 1/8] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 2/8] net: hdlc_ppp: add blank line after declarations Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 4/8] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

Fix the checkpatch error as "foo* bar" or "foo*bar" should be "foo *bar".

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 32f01d7..8614912 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -102,12 +102,12 @@ static struct sk_buff_head tx_queue; /* used when holding the spin lock */
 
 static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr);
 
-static inline struct ppp* get_ppp(struct net_device *dev)
+static inline struct ppp *get_ppp(struct net_device *dev)
 {
 	return (struct ppp *)dev_to_hdlc(dev)->state;
 }
 
-static inline struct proto* get_proto(struct net_device *dev, u16 pid)
+static inline struct proto *get_proto(struct net_device *dev, u16 pid)
 {
 	struct ppp *ppp = get_ppp(dev);
 
@@ -123,7 +123,7 @@ static inline struct proto* get_proto(struct net_device *dev, u16 pid)
 	}
 }
 
-static inline const char* proto_name(u16 pid)
+static inline const char *proto_name(u16 pid)
 {
 	switch (pid) {
 	case PID_LCP:
@@ -139,7 +139,7 @@ static inline const char* proto_name(u16 pid)
 
 static __be16 ppp_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
-	struct hdlc_header *data = (struct hdlc_header*)skb->data;
+	struct hdlc_header *data = (struct hdlc_header *)skb->data;
 
 	if (skb->len < sizeof(struct hdlc_header))
 		return htons(ETH_P_HDLC);
@@ -171,7 +171,7 @@ static int ppp_hard_header(struct sk_buff *skb, struct net_device *dev,
 #endif
 
 	skb_push(skb, sizeof(struct hdlc_header));
-	data = (struct hdlc_header*)skb->data;
+	data = (struct hdlc_header *)skb->data;
 
 	data->address = HDLC_ADDR_ALLSTATIONS;
 	data->control = HDLC_CTRL_UI;
@@ -432,7 +432,7 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id,
 
 static int ppp_rx(struct sk_buff *skb)
 {
-	struct hdlc_header *hdr = (struct hdlc_header*)skb->data;
+	struct hdlc_header *hdr = (struct hdlc_header *)skb->data;
 	struct net_device *dev = skb->dev;
 	struct ppp *ppp = get_ppp(dev);
 	struct proto *proto;
@@ -490,7 +490,7 @@ static int ppp_rx(struct sk_buff *skb)
 	if (pid == PID_LCP)
 		switch (cp->code) {
 		case LCP_PROTO_REJ:
-			pid = ntohs(*(__be16*)skb->data);
+			pid = ntohs(*(__be16 *)skb->data);
 			if (pid == PID_LCP || pid == PID_IPCP ||
 			    pid == PID_IPV6CP)
 				ppp_cp_event(dev, pid, RXJ_BAD, 0, 0,
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 4/8] net: hdlc_ppp: move out assignment in if condition
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
                   ` (2 preceding siblings ...)
  2021-06-16  9:33 ` [PATCH net-next 3/8] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue Guangbin Huang
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

Should not use assignment in if condition.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 8614912..fb5102c 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -375,7 +375,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id,
 	u8 *out;
 	unsigned int len = req_len, nak_len = 0, rej_len = 0;
 
-	if (!(out = kmalloc(len, GFP_ATOMIC))) {
+	out = kmalloc(len, GFP_ATOMIC);
+	if (!out) {
 		dev->stats.rx_dropped++;
 		return;	/* out of memory, ignore CR packet */
 	}
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
                   ` (3 preceding siblings ...)
  2021-06-16  9:33 ` [PATCH net-next 4/8] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16 16:20   ` Andrew Lunn
  2021-06-16  9:33 ` [PATCH net-next 6/8] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
                   ` (2 subsequent siblings)
  7 siblings, 1 reply; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

Networking block comments don't use an empty /* line,
use /* Comment...

Block comments use * on subsequent lines.
Block comments use a trailing */ on a separate line.

This patch fixes the comments style issues.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index fb5102c..9bda2c5 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -257,27 +257,25 @@ static void ppp_tx_cp(struct net_device *dev, u16 pid, u8 code,
 }
 
 /* State transition table (compare STD-51)
-   Events                                   Actions
-   TO+  = Timeout with counter > 0          irc = Initialize-Restart-Count
-   TO-  = Timeout with counter expired      zrc = Zero-Restart-Count
-
-   RCR+ = Receive-Configure-Request (Good)  scr = Send-Configure-Request
-   RCR- = Receive-Configure-Request (Bad)
-   RCA  = Receive-Configure-Ack             sca = Send-Configure-Ack
-   RCN  = Receive-Configure-Nak/Rej         scn = Send-Configure-Nak/Rej
-
-   RTR  = Receive-Terminate-Request         str = Send-Terminate-Request
-   RTA  = Receive-Terminate-Ack             sta = Send-Terminate-Ack
-
-   RUC  = Receive-Unknown-Code              scj = Send-Code-Reject
-   RXJ+ = Receive-Code-Reject (permitted)
-       or Receive-Protocol-Reject
-   RXJ- = Receive-Code-Reject (catastrophic)
-       or Receive-Protocol-Reject
-*/
+ * Events                                   Actions
+ * TO+  = Timeout with counter > 0          irc = Initialize-Restart-Count
+ * TO-  = Timeout with counter expired      zrc = Zero-Restart-Count
+ * RCR+ = Receive-Configure-Request (Good)  scr = Send-Configure-Request
+ * RCR- = Receive-Configure-Request (Bad)
+ * RCA  = Receive-Configure-Ack             sca = Send-Configure-Ack
+ * RCN  = Receive-Configure-Nak/Rej         scn = Send-Configure-Nak/Rej
+ * RTR  = Receive-Terminate-Request         str = Send-Terminate-Request
+ * RTA  = Receive-Terminate-Ack             sta = Send-Terminate-Ack
+ * RUC  = Receive-Unknown-Code              scj = Send-Code-Reject
+ * RXJ+ = Receive-Code-Reject (permitted)
+ *     or Receive-Protocol-Reject
+ * RXJ- = Receive-Code-Reject (catastrophic)
+ *     or Receive-Protocol-Reject
+ */
 static int cp_table[EVENTS][STATES] = {
 	/* CLOSED     STOPPED STOPPING REQ_SENT ACK_RECV ACK_SENT OPENED
-	     0           1         2       3       4      5          6    */
+	 *   0           1         2       3       4      5          6
+	 */
 	{IRC|SCR|3,     INV     , INV ,   INV   , INV ,  INV    ,   INV   }, /* START */
 	{   INV   ,      0      ,  0  ,    0    ,  0  ,   0     ,    0    }, /* STOP */
 	{   INV   ,     INV     ,STR|2,  SCR|3  ,SCR|3,  SCR|5  ,   INV   }, /* TO+ */
@@ -294,9 +292,10 @@ static int cp_table[EVENTS][STATES] = {
 };
 
 /* SCA: RCR+ must supply id, len and data
-   SCN: RCR- must supply code, id, len and data
-   STA: RTR must supply id
-   SCJ: RUC must supply CP packet len and data */
+ * SCN: RCR- must supply code, id, len and data
+ * STA: RTR must supply id
+ * SCJ: RUC must supply CP packet len and data
+ */
 static void ppp_cp_event(struct net_device *dev, u16 pid, u16 event, u8 code,
 			 u8 id, unsigned int len, const void *data)
 {
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 6/8] net: hdlc_ppp: remove unnecessary out of memory message
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
                   ` (4 preceding siblings ...)
  2021-06-16  9:33 ` [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces Guangbin Huang
  2021-06-16  9:33 ` [PATCH net-next 8/8] net: hdlc_ppp: add required space Guangbin Huang
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

This patch removes unnecessary out of memory message,
to fix the following checkpatch.pl warning:
"WARNING: Possible unnecessary 'out of memory' message"

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 9bda2c5..7b7c02d 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -219,10 +219,9 @@ static void ppp_tx_cp(struct net_device *dev, u16 pid, u8 code,
 
 	skb = dev_alloc_skb(sizeof(struct hdlc_header) +
 			    sizeof(struct cp_header) + magic_len + len);
-	if (!skb) {
-		netdev_warn(dev, "out of memory in ppp_tx_cp()\n");
+	if (!skb)
 		return;
-	}
+
 	skb_reserve(skb, sizeof(struct hdlc_header));
 
 	cp = skb_put(skb, sizeof(struct cp_header));
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
                   ` (5 preceding siblings ...)
  2021-06-16  9:33 ` [PATCH net-next 6/8] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  2021-06-16 16:23   ` Andrew Lunn
  2021-06-16  9:33 ` [PATCH net-next 8/8] net: hdlc_ppp: add required space Guangbin Huang
  7 siblings, 1 reply; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

According to the chackpatch.pl,
no spaces is necessary at the start of a line.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 7b7c02d..53c668e 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -34,8 +34,8 @@
 
 enum {IDX_LCP = 0, IDX_IPCP, IDX_IPV6CP, IDX_COUNT};
 enum {CP_CONF_REQ = 1, CP_CONF_ACK, CP_CONF_NAK, CP_CONF_REJ, CP_TERM_REQ,
-      CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
-      LCP_DISC_REQ, CP_CODES};
+	CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
+	LCP_DISC_REQ, CP_CODES};
 #if DEBUG_CP
 static const char *const code_names[CP_CODES] = {
 	"0", "ConfReq", "ConfAck", "ConfNak", "ConfRej", "TermReq",
@@ -80,11 +80,11 @@ struct ppp {
 };
 
 enum {CLOSED = 0, STOPPED, STOPPING, REQ_SENT, ACK_RECV, ACK_SENT, OPENED,
-      STATES, STATE_MASK = 0xF};
+	STATES, STATE_MASK = 0xF};
 enum {START = 0, STOP, TO_GOOD, TO_BAD, RCR_GOOD, RCR_BAD, RCA, RCN, RTR, RTA,
-      RUC, RXJ_GOOD, RXJ_BAD, EVENTS};
+	RUC, RXJ_GOOD, RXJ_BAD, EVENTS};
 enum {INV = 0x10, IRC = 0x20, ZRC = 0x40, SCR = 0x80, SCA = 0x100,
-      SCN = 0x200, STR = 0x400, STA = 0x800, SCJ = 0x1000};
+	SCN = 0x200, STR = 0x400, STA = 0x800, SCJ = 0x1000};
 
 #if DEBUG_STATE
 static const char *const state_names[STATES] = {
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH net-next 8/8] net: hdlc_ppp: add required space
  2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
                   ` (6 preceding siblings ...)
  2021-06-16  9:33 ` [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces Guangbin Huang
@ 2021-06-16  9:33 ` Guangbin Huang
  7 siblings, 0 replies; 13+ messages in thread
From: Guangbin Huang @ 2021-06-16  9:33 UTC (permalink / raw)
  To: davem, kuba, xie.he.0141, ms, willemb
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2

From: Peng Li <lipeng321@huawei.com>

Add space required after that ','.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/wan/hdlc_ppp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 53c668e..bef7373 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -676,7 +676,8 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)
 
 		/* no settable parameters */
 
-		result = hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);
+		result = hdlc->attach(dev, ENCODING_NRZ,
+				      PARITY_CRC16_PR1_CCITT);
 		if (result)
 			return result;
 
-- 
2.8.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue
  2021-06-16  9:33 ` [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue Guangbin Huang
@ 2021-06-16 16:20   ` Andrew Lunn
  2021-06-17  1:00     ` lipeng (Y)
  0 siblings, 1 reply; 13+ messages in thread
From: Andrew Lunn @ 2021-06-16 16:20 UTC (permalink / raw)
  To: Guangbin Huang
  Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel, lipeng321

>  static int cp_table[EVENTS][STATES] = {
>  	/* CLOSED     STOPPED STOPPING REQ_SENT ACK_RECV ACK_SENT OPENED
> -	     0           1         2       3       4      5          6    */
> +	 *   0           1         2       3       4      5          6
> +	 */
>  	{IRC|SCR|3,     INV     , INV ,   INV   , INV ,  INV    ,   INV   }, /* START */
>  	{   INV   ,      0      ,  0  ,    0    ,  0  ,   0     ,    0    }, /* STOP */
>  	{   INV   ,     INV     ,STR|2,  SCR|3  ,SCR|3,  SCR|5  ,   INV   }, /* TO+ */

This probably reduces the readability of the code. So i would not make
this change.

Please remember these are only guidelines. Please don't blindly make
changes, or change it because some bot says so. Check that it actually
makes sense and the code is better afterwards.

      Andrew

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces
  2021-06-16  9:33 ` [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces Guangbin Huang
@ 2021-06-16 16:23   ` Andrew Lunn
  2021-06-17  1:05     ` lipeng (Y)
  0 siblings, 1 reply; 13+ messages in thread
From: Andrew Lunn @ 2021-06-16 16:23 UTC (permalink / raw)
  To: Guangbin Huang
  Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel, lipeng321

On Wed, Jun 16, 2021 at 05:33:56PM +0800, Guangbin Huang wrote:
> From: Peng Li <lipeng321@huawei.com>
> 
> According to the chackpatch.pl,
> no spaces is necessary at the start of a line.
> 
> Signed-off-by: Peng Li <lipeng321@huawei.com>
> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
> ---
>  drivers/net/wan/hdlc_ppp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
> index 7b7c02d..53c668e 100644
> --- a/drivers/net/wan/hdlc_ppp.c
> +++ b/drivers/net/wan/hdlc_ppp.c
> @@ -34,8 +34,8 @@
>  
>  enum {IDX_LCP = 0, IDX_IPCP, IDX_IPV6CP, IDX_COUNT};
>  enum {CP_CONF_REQ = 1, CP_CONF_ACK, CP_CONF_NAK, CP_CONF_REJ, CP_TERM_REQ,
> -      CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
> -      LCP_DISC_REQ, CP_CODES};
> +	CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
> +	LCP_DISC_REQ, CP_CODES};

Do you think this looks better or worse after the change?

   Andrew

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue
  2021-06-16 16:20   ` Andrew Lunn
@ 2021-06-17  1:00     ` lipeng (Y)
  0 siblings, 0 replies; 13+ messages in thread
From: lipeng (Y) @ 2021-06-17  1:00 UTC (permalink / raw)
  To: Andrew Lunn, Guangbin Huang
  Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel


在 2021/6/17 0:20, Andrew Lunn 写道:
>>   static int cp_table[EVENTS][STATES] = {
>>   	/* CLOSED     STOPPED STOPPING REQ_SENT ACK_RECV ACK_SENT OPENED
>> -	     0           1         2       3       4      5          6    */
>> +	 *   0           1         2       3       4      5          6
>> +	 */
>>   	{IRC|SCR|3,     INV     , INV ,   INV   , INV ,  INV    ,   INV   }, /* START */
>>   	{   INV   ,      0      ,  0  ,    0    ,  0  ,   0     ,    0    }, /* STOP */
>>   	{   INV   ,     INV     ,STR|2,  SCR|3  ,SCR|3,  SCR|5  ,   INV   }, /* TO+ */
> This probably reduces the readability of the code. So i would not make
> this change.
>
> Please remember these are only guidelines. Please don't blindly make
> changes, or change it because some bot says so. Check that it actually
> makes sense and the code is better afterwards.
>
>        Andrew
> .

Agree with you they are only guidelines.

The code should  follow the rules mostly, or  it will be diferent style 
from different developer.

If that's the exception, i will drop this patch.


Thanks

             Peng Li


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces
  2021-06-16 16:23   ` Andrew Lunn
@ 2021-06-17  1:05     ` lipeng (Y)
  0 siblings, 0 replies; 13+ messages in thread
From: lipeng (Y) @ 2021-06-17  1:05 UTC (permalink / raw)
  To: Andrew Lunn, Guangbin Huang
  Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel


在 2021/6/17 0:23, Andrew Lunn 写道:
> On Wed, Jun 16, 2021 at 05:33:56PM +0800, Guangbin Huang wrote:
>> From: Peng Li <lipeng321@huawei.com>
>>
>> According to the chackpatch.pl,
>> no spaces is necessary at the start of a line.
>>
>> Signed-off-by: Peng Li <lipeng321@huawei.com>
>> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
>> ---
>>   drivers/net/wan/hdlc_ppp.c | 10 +++++-----
>>   1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
>> index 7b7c02d..53c668e 100644
>> --- a/drivers/net/wan/hdlc_ppp.c
>> +++ b/drivers/net/wan/hdlc_ppp.c
>> @@ -34,8 +34,8 @@
>>   
>>   enum {IDX_LCP = 0, IDX_IPCP, IDX_IPV6CP, IDX_COUNT};
>>   enum {CP_CONF_REQ = 1, CP_CONF_ACK, CP_CONF_NAK, CP_CONF_REJ, CP_TERM_REQ,
>> -      CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
>> -      LCP_DISC_REQ, CP_CODES};
>> +	CP_TERM_ACK, CP_CODE_REJ, LCP_PROTO_REJ, LCP_ECHO_REQ, LCP_ECHO_REPLY,
>> +	LCP_DISC_REQ, CP_CODES};
> Do you think this looks better or worse after the change?
>
>     Andrew
> .

It is better after the change as the code style follow the same rule.

What's your suggestion?



^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-06-17  1:05 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16  9:33 [PATCH net-next 0/8] net: hdlc_ppp: clean up some code style issues Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 1/8] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 2/8] net: hdlc_ppp: add blank line after declarations Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 3/8] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 4/8] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 5/8] net: hdlc_ppp: fix the comments style issue Guangbin Huang
2021-06-16 16:20   ` Andrew Lunn
2021-06-17  1:00     ` lipeng (Y)
2021-06-16  9:33 ` [PATCH net-next 6/8] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
2021-06-16  9:33 ` [PATCH net-next 7/8] net: hdlc_ppp: remove redundant spaces Guangbin Huang
2021-06-16 16:23   ` Andrew Lunn
2021-06-17  1:05     ` lipeng (Y)
2021-06-16  9:33 ` [PATCH net-next 8/8] net: hdlc_ppp: add required space Guangbin Huang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).