Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / can / isotp.c

diff --git a/net/can/isotp.c b/net/can/isotp.c
index be6183f..bd49299 100644 (file)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -225,8 +225,8 @@ static int isotp_send_fc(struct sock *sk, int ae, u8 flowstatus)
 
        can_send_ret = can_send(nskb, 1);
        if (can_send_ret)
-               pr_notice_once("can-isotp: %s: can_send_ret %d\n",
-                              __func__, can_send_ret);
+               pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+                              __func__, ERR_PTR(can_send_ret));
 
        dev_put(dev);
 
@@ -801,10 +801,12 @@ isotp_tx_burst:
                can_skb_set_owner(skb, sk);
 
                can_send_ret = can_send(skb, 1);
-               if (can_send_ret)
-                       pr_notice_once("can-isotp: %s: can_send_ret %d\n",
-                                      __func__, can_send_ret);
-
+               if (can_send_ret) {
+                       pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+                                      __func__, ERR_PTR(can_send_ret));
+                       if (can_send_ret == -ENOBUFS)
+                               pr_notice_once("can-isotp: tx queue is full, increasing txqueuelen may prevent this error\n");
+               }
                if (so->tx.idx >= so->tx.len) {
                        /* we are done */
                        so->tx.state = ISOTP_IDLE;
@@ -950,8 +952,8 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
        err = can_send(skb, 1);
        dev_put(dev);
        if (err) {
-               pr_notice_once("can-isotp: %s: can_send_ret %d\n",
-                              __func__, err);
+               pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+                              __func__, ERR_PTR(err));
                return err;
        }
 
@@ -1482,7 +1484,7 @@ static __init int isotp_module_init(void)
 
        err = can_proto_register(&isotp_can_proto);
        if (err < 0)
-               pr_err("can: registration of isotp protocol failed\n");
+               pr_err("can: registration of isotp protocol failed %pe\n", ERR_PTR(err));
        else
                register_netdevice_notifier(&canisotp_notifier);