* [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues
@ 2021-06-17 14:03 Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 1/6] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="yes", Size: 666 bytes --]
This patchset clean up some code style issues.
---
Change Log:
V1 -> V2:
1. remove patch "net: hdlc_ppp: fix the comments style issue" and
patch "net: hdlc_ppp: remove redundant spaces" from this patchset.
---
Peng Li (6):
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: remove unnecessary out of memory message
net: hdlc_ppp: add required space
drivers/net/wan/hdlc_ppp.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
--
2.8.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 1/6] net: hdlc_ppp: remove redundant blank lines
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 2/6] net: hdlc_ppp: add blank line after declarations Guangbin Huang
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 261b53fc8e04..e25b2f058d8c 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 related [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 2/6] net: hdlc_ppp: add blank line after declarations
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 1/6] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 3/6] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 e25b2f058d8c..32f01d7e12d4 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 related [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 3/6] net: hdlc_ppp: fix the code style issue about "foo* bar"
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 1/6] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 2/6] net: hdlc_ppp: add blank line after declarations Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 4/6] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 32f01d7e12d4..861491206f12 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 related [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 4/6] net: hdlc_ppp: move out assignment in if condition
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
` (2 preceding siblings ...)
2021-06-17 14:03 ` [PATCH V2 net-next 3/6] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 5/6] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 861491206f12..fb5102c1afc6 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 related [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 5/6] net: hdlc_ppp: remove unnecessary out of memory message
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
` (3 preceding siblings ...)
2021-06-17 14:03 ` [PATCH V2 net-next 4/6] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 6/6] net: hdlc_ppp: add required space Guangbin Huang
2021-06-17 19:20 ` [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 fb5102c1afc6..aec9cc4d5b48 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 related [flat|nested] 8+ messages in thread
* [PATCH V2 net-next 6/6] net: hdlc_ppp: add required space
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
` (4 preceding siblings ...)
2021-06-17 14:03 ` [PATCH V2 net-next 5/6] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
@ 2021-06-17 14:03 ` Guangbin Huang
2021-06-17 19:20 ` [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: Guangbin Huang @ 2021-06-17 14:03 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 aec9cc4d5b48..834be2ae3e9e 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -677,7 +677,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 related [flat|nested] 8+ messages in thread
* Re: [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
` (5 preceding siblings ...)
2021-06-17 14:03 ` [PATCH V2 net-next 6/6] net: hdlc_ppp: add required space Guangbin Huang
@ 2021-06-17 19:20 ` patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-17 19:20 UTC (permalink / raw)
To: Guangbin Huang
Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel, lipeng321
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Thu, 17 Jun 2021 22:03:13 +0800 you wrote:
> This patchset clean up some code style issues.
>
> ---
> Change Log:
> V1 -> V2:
> 1. remove patch "net: hdlc_ppp: fix the comments style issue" and
> patch "net: hdlc_ppp: remove redundant spaces" from this patchset.
>
> [...]
Here is the summary with links:
- [V2,net-next,1/6] net: hdlc_ppp: remove redundant blank lines
https://git.kernel.org/netdev/net-next/c/f271606f5289
- [V2,net-next,2/6] net: hdlc_ppp: add blank line after declarations
https://git.kernel.org/netdev/net-next/c/2b57681f94af
- [V2,net-next,3/6] net: hdlc_ppp: fix the code style issue about "foo* bar"
https://git.kernel.org/netdev/net-next/c/cb36c4112c52
- [V2,net-next,4/6] net: hdlc_ppp: move out assignment in if condition
https://git.kernel.org/netdev/net-next/c/4ec479527b9a
- [V2,net-next,5/6] net: hdlc_ppp: remove unnecessary out of memory message
https://git.kernel.org/netdev/net-next/c/ee58a3c7c6bb
- [V2,net-next,6/6] net: hdlc_ppp: add required space
https://git.kernel.org/netdev/net-next/c/37cb4b9ce062
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-06-17 19:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-17 14:03 [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 1/6] net: hdlc_ppp: remove redundant blank lines Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 2/6] net: hdlc_ppp: add blank line after declarations Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 3/6] net: hdlc_ppp: fix the code style issue about "foo* bar" Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 4/6] net: hdlc_ppp: move out assignment in if condition Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 5/6] net: hdlc_ppp: remove unnecessary out of memory message Guangbin Huang
2021-06-17 14:03 ` [PATCH V2 net-next 6/6] net: hdlc_ppp: add required space Guangbin Huang
2021-06-17 19:20 ` [PATCH V2 net-next 0/6] net: hdlc_ppp: clean up some code style issues patchwork-bot+netdevbpf
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).