From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B164C10F14 for ; Thu, 3 Oct 2019 16:00:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3448921D81 for ; Thu, 3 Oct 2019 16:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118441; bh=qzG6mCQpLxLIoCbBJuTAvVzD7OE70ySI0GNPu4Bq79Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DCJBjXt1OZVe7wGz+fxATef+fNA22WroEQaK1ih+HiryXb3fY2/lTTqXPyaO6HWZl /woui0QTMwzo+Q3zALJQoUIwEnndUAccnKajKfveh3EyzqVzQg7NuXUby3+jP274lh xKqbagefvzHI2K25CSJr6qPm7CCbbTmO/d7bK9Ak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729616AbfJCQAk (ORCPT ); Thu, 3 Oct 2019 12:00:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:44490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729183AbfJCQAj (ORCPT ); Thu, 3 Oct 2019 12:00:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1837B20700; Thu, 3 Oct 2019 16:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118438; bh=qzG6mCQpLxLIoCbBJuTAvVzD7OE70ySI0GNPu4Bq79Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A4uAFCYzgQ0hdV7Kb/T1rxQDz7fhy8Keubs+gAdcy8CkFXILhXv4QI9PvqM/17Znr Kkw54l4c1bE2AllZNeLrhJRMjNrUv9j623lOsGNj7d8m1Ag+D3VH5P4O7xz2COidad O4Xg8aOGp2tQ+qNzjK9b/uGJhdBEanm+Z4mJGsxI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= , Johannes Berg , Sasha Levin Subject: [PATCH 4.9 012/129] mac80211: Print text for disassociation reason Date: Thu, 3 Oct 2019 17:52:15 +0200 Message-Id: <20191003154323.946752777@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arkadiusz Miskiewicz [ Upstream commit 68506e9af132a6b5735c1dd4b11240da0cf5eeae ] When disassociation happens only numeric reason is printed in ieee80211_rx_mgmt_disassoc(). Add text variant, too. Signed-off-by: Arkadiusz Miśkiewicz Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mlme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f462f026fc6aa..090e2aa8630e8 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2869,8 +2869,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); - sdata_info(sdata, "disassociated from %pM (Reason: %u)\n", - mgmt->sa, reason_code); + sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n", + mgmt->sa, reason_code, + ieee80211_get_reason_code_string(reason_code)); ieee80211_set_disassoc(sdata, 0, 0, false, NULL); -- 2.20.1