Merge tag 'amd-drm-fixes-5.14-2021-08-11' of https://gitlab.freedesktop.org/agd5f...

[linux-2.6-microblaze.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index d56941d..57a1971 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3207,7 +3207,7 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,
        } else {
                sk->sk_err = ENETDOWN;
                if (!sock_flag(sk, SOCK_DEAD))
-                       sk->sk_error_report(sk);
+                       sk_error_report(sk);
        }
 
 out_unlock:
@@ -3935,12 +3935,9 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,
                        return -EFAULT;
 
                lock_sock(sk);
-               if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) {
-                       ret = -EBUSY;
-               } else {
+               if (!po->rx_ring.pg_vec && !po->tx_ring.pg_vec)
                        po->tp_tx_has_off = !!val;
-                       ret = 0;
-               }
+
                release_sock(sk);
                return 0;
        }
@@ -4107,7 +4104,7 @@ static int packet_notifier(struct notifier_block *this,
                                        __unregister_prot_hook(sk, false);
                                        sk->sk_err = ENETDOWN;
                                        if (!sock_flag(sk, SOCK_DEAD))
-                                               sk->sk_error_report(sk);
+                                               sk_error_report(sk);
                                }
                                if (msg == NETDEV_UNREGISTER) {
                                        packet_cached_dev_reset(po);