Merge tag 'for-5.19/block-2022-06-02' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / net / amt.c

diff --git a/drivers/net/amt.c b/drivers/net/amt.c
index de4ea51..ebee5f0 100644 (file)
--- a/drivers/net/amt.c
+++ b/drivers/net/amt.c
@@ -57,7 +57,7 @@ static char *type_str[] = {
        "AMT_MSG_MEMBERSHIP_QUERY",
        "AMT_MSG_MEMBERSHIP_UPDATE",
        "AMT_MSG_MULTICAST_DATA",
-       "AMT_MSG_TEARDOWM",
+       "AMT_MSG_TEARDOWN",
 };
 
 static char *action_str[] = {
@@ -2423,7 +2423,7 @@ static bool amt_update_handler(struct amt_dev *amt, struct sk_buff *skb)
                }
        }
 
-       return false;
+       return true;
 
 report:
        iph = ip_hdr(skb);
@@ -2679,7 +2679,7 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb)
        amt = rcu_dereference_sk_user_data(sk);
        if (!amt) {
                err = true;
-               goto out;
+               goto drop;
        }
 
        skb->dev = amt->dev;