diff mbox series

drivers: net: bluetooth: centralize function exit and print error

Message ID 20220425030053.517168-1-ian@linux.cowan.aero
State New
Headers show
Series drivers: net: bluetooth: centralize function exit and print error | expand

Commit Message

Ian Cowan April 25, 2022, 3 a.m. UTC
Centralize the return for this one function, and this will add the error
being printed if it occurs earlier in the function. The same thing will
be returned with the logic, so the only thing that will differ is an
extra debugging output for an error.

Signed-off-by: Ian Cowan <ian@linux.cowan.aero>
---
 net/bluetooth/6lowpan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

bluez.test.bot@gmail.com April 25, 2022, 3:57 a.m. UTC | #1
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=635140

---Test result---

Test Summary:
CheckPatch                    PASS      1.66 seconds
GitLint                       PASS      0.95 seconds
SubjectPrefix                 FAIL      0.83 seconds
BuildKernel                   PASS      31.73 seconds
BuildKernel32                 PASS      29.18 seconds
Incremental Build with patchesPASS      38.44 seconds
TestRunner: Setup             PASS      474.46 seconds
TestRunner: l2cap-tester      PASS      17.79 seconds
TestRunner: bnep-tester       PASS      6.41 seconds
TestRunner: mgmt-tester       PASS      104.80 seconds
TestRunner: rfcomm-tester     PASS      9.90 seconds
TestRunner: sco-tester        PASS      9.63 seconds
TestRunner: smp-tester        PASS      9.66 seconds
TestRunner: userchan-tester   PASS      6.67 seconds

Details
##############################
Test: SubjectPrefix - FAIL - 0.83 seconds
Check subject contains "Bluetooth" prefix
"Bluetooth: " is not specified in the subject



---
Regards,
Linux Bluetooth
diff mbox series

Patch

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 215af9b3b589..15928e9ce088 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -516,7 +516,7 @@  static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
 	err = setup_header(skb, netdev, &addr, &addr_type);
 	if (err < 0) {
 		kfree_skb(skb);
-		return NET_XMIT_DROP;
+		goto output_error_ret;
 	}
 
 	if (err) {
@@ -537,6 +537,7 @@  static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
 
 	dev_kfree_skb(skb);
 
+output_error_ret:
 	if (err)
 		BT_DBG("ERROR: xmit failed (%d)", err);