summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/marvell/libertas_tf
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-06-26 20:12:17 +0300
committerDavid S. Miller <davem@davemloft.net>2019-06-26 20:12:17 +0300
commita8b79105239d3aecdf4942f7e53a14e0842dd5d2 (patch)
tree94498223d0ddde3517e651da73ec5da5450ada78 /drivers/net/wireless/marvell/libertas_tf
parent177d935a13703eb809049c97c31a1e4d80b4cfbb (diff)
parente5db0ad7563c38b7b329504836c9a64ae025a47a (diff)
downloadlinux-a8b79105239d3aecdf4942f7e53a14e0842dd5d2.tar.xz
Merge tag 'wireless-drivers-next-for-davem-2019-06-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valu says: ==================== wireless-drivers-next patches for 5.3 First set of patches for 5.3, but not that many patches this time. This pull request fails to compile with the tip tree due to ktime_get_boot_ns() API changes there. It should be easy for Linus to fix it in p54 driver once he pulls this, an example resolution here: https://lkml.kernel.org/r/20190625160432.533aa140@canb.auug.org.au Major changes: airo * switch to use skcipher interface p54 * support boottime in scan results rtw88 * add fast xmit support * add random mac address on scan support rt2x00 * add software watchdog to detect hangs, it's disabled by default ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/marvell/libertas_tf')
-rw-r--r--drivers/net/wireless/marvell/libertas_tf/if_usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
index 28a8bd3cf10c..25ac9db35dbf 100644
--- a/drivers/net/wireless/marvell/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
@@ -315,7 +315,7 @@ static int if_usb_send_fw_pkt(struct if_usb_card *cardp)
} else if (fwdata->hdr.dnldcmd == cpu_to_le32(FW_HAS_LAST_BLOCK)) {
lbtf_deb_usb2(&cardp->udev->dev,
"Host has finished FW downloading\n");
- lbtf_deb_usb2(&cardp->udev->dev, "Donwloading FW JUMP BLOCK\n");
+ lbtf_deb_usb2(&cardp->udev->dev, "Downloading FW JUMP BLOCK\n");
/* Host has finished FW downloading
* Donwloading FW JUMP BLOCK