From: Dorine Tipo <dorine.a.tipo@gmail.com>
To: outreachy@lists.linux.dev, helen.fornazier@gmail.com,
gagallo7+outreachy@gmail.com
Cc: Dorine Tipo <dorine.a.tipo@gmail.com>
Subject: [PATCH] Signed-off-by: Dorine Tipo <dorine.a.tipo@gmail.com>
Date: Sun, 29 Oct 2023 09:19:13 +0000 [thread overview]
Message-ID: <20231029091913.17509-1-dorine.a.tipo@gmail.com> (raw)
Fix code style issues and improve error handling in ethernet-tx.c
This commit addresses the following issues in the drivers/staging/octeon/ethernet-tx.c file:
1. Removed unnecessary parentheses around conditions:
- Removed unnecessary parentheses around 'CVMX_PKO_QUEUES_PER_PORT_INTERFACE0 > 1' and 'CVMX_PKO_QUEUES_PER_PORT_INTERFACE1 > 1'.
- Removed unnecessary parentheses around 'skb->len < 64'.
- Removed unnecessary parentheses around 'skb->protocol == htons(ETH_P_IP)'.
2. Replaced 'BUG()' with 'WARN_ON_ONCE()' for better error handling:
- Replaced the use of 'BUG()' with 'WARN_ON_ONCE()' at line 454 to avoid crashing the kernel and provide more graceful error handling.
3. Removed redundant code sections:
- Removed the code enclosed by the #if 0 and its #endif directives at lines 577, 586, and 599 as they are no longer needed.
These changes improve code readability, reduce unnecessary parentheses, and enhance error handling
while removing redundant code sections. The code is now more in line with coding standards and best practices.
---
drivers/staging/octeon/ethernet-tx.c | 50 +++-------------------------
1 file changed, 5 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index bbf33b88bb7c..cdc98ce2e61e 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -153,8 +153,8 @@ netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
* completely remove "qos" in the event neither interface
* supports multiple queues per port.
*/
- if ((CVMX_PKO_QUEUES_PER_PORT_INTERFACE0 > 1) ||
- (CVMX_PKO_QUEUES_PER_PORT_INTERFACE1 > 1)) {
+ if (CVMX_PKO_QUEUES_PER_PORT_INTERFACE0 > 1 ||
+ CVMX_PKO_QUEUES_PER_PORT_INTERFACE1 > 1) {
qos = GET_SKBUFF_QOS(skb);
if (qos <= 0)
qos = 0;
@@ -224,7 +224,7 @@ netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
* no room to add the padding. The kernel should always give
* us at least a cache line
*/
- if ((skb->len < 64) && OCTEON_IS_MODEL(OCTEON_CN3XXX)) {
+ if (skb->len < 64 && OCTEON_IS_MODEL(OCTEON_CN3XXX)) {
union cvmx_gmxx_prtx_cfg gmx_prt_cfg;
int interface = INTERFACE(priv->port);
int index = INDEX(priv->port);
@@ -360,7 +360,7 @@ netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
dont_put_skbuff_in_hw:
/* Check if we can use the hardware checksumming */
- if ((skb->protocol == htons(ETH_P_IP)) &&
+ if (skb->protocol == htons(ETH_P_IP) &&
(ip_hdr(skb)->version == 4) &&
(ip_hdr(skb)->ihl == 5) &&
((ip_hdr(skb)->frag_off == 0) ||
@@ -451,7 +451,7 @@ netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
__skb_queue_tail(&priv->tx_free_list[qos], skb);
break;
default:
- BUG();
+ WARN_ON_ONCE(1);
}
while (skb_to_free > 0) {
@@ -574,42 +574,14 @@ netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
if (skb->protocol == htons(ETH_P_IP)) {
work->word2.s.ip_offset = 14;
-#if 0
- work->word2.s.vlan_valid = 0; /* FIXME */
- work->word2.s.vlan_cfi = 0; /* FIXME */
- work->word2.s.vlan_id = 0; /* FIXME */
- work->word2.s.dec_ipcomp = 0; /* FIXME */
-#endif
work->word2.s.tcp_or_udp =
(ip_hdr(skb)->protocol == IPPROTO_TCP) ||
(ip_hdr(skb)->protocol == IPPROTO_UDP);
-#if 0
- /* FIXME */
- work->word2.s.dec_ipsec = 0;
- /* We only support IPv4 right now */
- work->word2.s.is_v6 = 0;
- /* Hardware would set to zero */
- work->word2.s.software = 0;
- /* No error, packet is internal */
- work->word2.s.L4_error = 0;
-#endif
work->word2.s.is_frag = !((ip_hdr(skb)->frag_off == 0) ||
(ip_hdr(skb)->frag_off ==
cpu_to_be16(1 << 14)));
-#if 0
- /* Assume Linux is sending a good packet */
- work->word2.s.IP_exc = 0;
-#endif
work->word2.s.is_bcast = (skb->pkt_type == PACKET_BROADCAST);
work->word2.s.is_mcast = (skb->pkt_type == PACKET_MULTICAST);
-#if 0
- /* This is an IP packet */
- work->word2.s.not_IP = 0;
- /* No error, packet is internal */
- work->word2.s.rcv_error = 0;
- /* No error, packet is internal */
- work->word2.s.err_code = 0;
-#endif
/*
* When copying the data, include 4 bytes of the
@@ -619,12 +591,6 @@ netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
memcpy(work->packet_data, skb->data + 10,
sizeof(work->packet_data));
} else {
-#if 0
- work->word2.snoip.vlan_valid = 0; /* FIXME */
- work->word2.snoip.vlan_cfi = 0; /* FIXME */
- work->word2.snoip.vlan_id = 0; /* FIXME */
- work->word2.snoip.software = 0; /* Hardware would set to zero */
-#endif
work->word2.snoip.is_rarp = skb->protocol == htons(ETH_P_RARP);
work->word2.snoip.is_arp = skb->protocol == htons(ETH_P_ARP);
work->word2.snoip.is_bcast =
@@ -632,12 +598,6 @@ netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
work->word2.snoip.is_mcast =
(skb->pkt_type == PACKET_MULTICAST);
work->word2.snoip.not_IP = 1; /* IP was done up above */
-#if 0
- /* No error, packet is internal */
- work->word2.snoip.rcv_error = 0;
- /* No error, packet is internal */
- work->word2.snoip.err_code = 0;
-#endif
memcpy(work->packet_data, skb->data, sizeof(work->packet_data));
}
--
2.25.1
next reply other threads:[~2023-10-29 10:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 9:19 Dorine Tipo [this message]
2023-10-29 10:36 ` [PATCH] Signed-off-by: Dorine Tipo <dorine.a.tipo@gmail.com> Julia Lawall
-- strict thread matches above, loose matches on Subject: below --
2023-10-29 9:47 Dorine Tipo
2023-10-29 11:10 ` Julia Lawall
2023-10-29 11:12 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231029091913.17509-1-dorine.a.tipo@gmail.com \
--to=dorine.a.tipo@gmail.com \
--cc=gagallo7+outreachy@gmail.com \
--cc=helen.fornazier@gmail.com \
--cc=outreachy@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).