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

[platform/kernel/linux-starfive.git] / net / can / j1939 / socket.c

diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c
index e1a3998..54f6d52 100644 (file)
--- a/net/can/j1939/socket.c
+++ b/net/can/j1939/socket.c
@@ -1012,7 +1012,7 @@ void j1939_sk_send_loop_abort(struct sock *sk, int err)
 {
        sk->sk_err = err;
 
-       sk->sk_error_report(sk);
+       sk_error_report(sk);
 }
 
 static int j1939_sk_send_loop(struct j1939_priv *priv,  struct sock *sk,
@@ -1192,7 +1192,7 @@ void j1939_sk_netdev_event_netdown(struct j1939_priv *priv)
        list_for_each_entry(jsk, &priv->j1939_socks, list) {
                jsk->sk.sk_err = error_code;
                if (!sock_flag(&jsk->sk, SOCK_DEAD))
-                       jsk->sk.sk_error_report(&jsk->sk);
+                       sk_error_report(&jsk->sk);
 
                j1939_sk_queue_drop_all(priv, jsk, error_code);
        }