All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>
Cc: Linux USB Mailing List <linux-usb@vger.kernel.org>,
	Brooke Basile <brookebasile@gmail.com>,
	"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
	Felipe Balbi <balbi@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Lorenzo Colitti <lorenzo@google.com>
Subject: [PATCH 4/6] usb: gadget: f_ncm: remove spurious if statement
Date: Thu,  1 Jul 2021 04:48:32 -0700	[thread overview]
Message-ID: <20210701114834.884597-4-zenczykowski@gmail.com> (raw)
In-Reply-To: <20210701114834.884597-1-zenczykowski@gmail.com>

From: Maciej Żenczykowski <maze@google.com>

the current logic is:

  struct sk_buff  *skb2 = NULL;
  ...

  if (!skb && !ncm->skb_tx_data)
    return NULL;

  if (skb) {
    ...
  } else if (ncm->skb_tx_data)
    ...
  }

  return skb2;

Which means that first if statement is simply not needed.

Cc: Brooke Basile <brookebasile@gmail.com>
Cc: "Bryan O'Donoghue" <bryan.odonoghue@linaro.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
 drivers/usb/gadget/function/f_ncm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 77f55b3c805a..cab17ae4fa34 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1025,9 +1025,6 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
 	const int rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
 	const int dgram_idx_len = 2 * 2 * opts->dgram_item_len;
 
-	if (!skb && !ncm->skb_tx_data)
-		return NULL;
-
 	if (skb) {
 		/* Add the CRC if required up front */
 		if (ncm->is_crc) {
-- 
2.32.0.93.g670b81a890-goog


  parent reply	other threads:[~2021-07-01 11:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-01 11:48 [PATCH 1/6] usb: gadget: f_ncm: remove timer_force_tx field Maciej Żenczykowski
2021-07-01 11:48 ` [PATCH 2/6] usb: gadget: f_ncm: remove spurious boolean timer_stopping Maciej Żenczykowski
2021-07-01 11:48 ` [PATCH 3/6] usb: gadget: f_ncm: remove check for NULL skb_tx_data in timer function Maciej Żenczykowski
2021-07-01 11:48 ` Maciej Żenczykowski [this message]
2021-07-01 11:48 ` [PATCH 5/6] usb: gadget: f_ncm: ncm_wrap_ntb - move var definitions into if statement Maciej Żenczykowski
2021-07-01 11:48 ` [PATCH 6/6] usb: gadget: u_ether: fix a potential null pointer dereference Maciej Żenczykowski

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=20210701114834.884597-4-zenczykowski@gmail.com \
    --to=zenczykowski@gmail.com \
    --cc=balbi@kernel.org \
    --cc=brookebasile@gmail.com \
    --cc=bryan.odonoghue@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=lorenzo@google.com \
    --cc=maze@google.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.