From: Kalle Valo <kvalo@codeaurora.org>
To: Anilkumar Kolli <akolli@codeaurora.org>
Cc: ath11k@lists.infradead.org
Subject: Re: [PATCH v2] ath11k: move per peer pktlog entry to per sta debugfs
Date: Thu, 02 May 2019 16:44:35 +0300 [thread overview]
Message-ID: <874l6dm0n0.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1556099374-11893-1-git-send-email-akolli@codeaurora.org> (Anilkumar Kolli's message of "Wed, 24 Apr 2019 15:19:34 +0530")
Anilkumar Kolli <akolli@codeaurora.org> writes:
> Per peer pktlog is enabled through per sta debugfs
> Currently this feature is limited on single peer.
>
> Enable pktlog using,
> echo "0x6f 2" > /sys/kernel/debug/ath11k/mac0/pktlog_filter
>
> Enable peer pktlog using,
> echo 1 > /sys/kernel/debug/ieee80211/phy9/netdev\:wlan0/stations
> /8c\:fd\:f0\:0a\:8c\:14/peer_pktlog
>
> Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Thank you for using ath11k-bringup branch as the baseline so with help
of 3-way merge I was able to fix easy the conflict in debugfs_sta.c.
This is now applied.
Applying: ath11k: move per peer pktlog entry to per sta debugfs
Using index info to reconstruct a base tree...
M drivers/net/wireless/ath/ath11k/debugfs_sta.c
M drivers/net/wireless/ath/ath11k/dp_rx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath11k/dp_rx.c
Auto-merging drivers/net/wireless/ath/ath11k/debugfs_sta.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath11k/debugfs_sta.c
Recorded preimage for 'drivers/net/wireless/ath/ath11k/debugfs_sta.c'
error: Failed to merge in the changes.
Patch failed at 0001 ath11k: move per peer pktlog entry to per sta debugfs
--
Kalle Valo
_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
next prev parent reply other threads:[~2019-05-02 13:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 9:49 [PATCH v2] ath11k: move per peer pktlog entry to per sta debugfs Anilkumar Kolli
2019-05-02 13:44 ` Kalle Valo [this message]
2019-05-02 14:10 ` Anilkumar Kolli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874l6dm0n0.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=akolli@codeaurora.org \
--cc=ath11k@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox