From 6ee40802015fa50ff8a28fbbbda2d6c6eef40601 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 11 Feb 2012 20:56:59 +0900 Subject: [PATCH] --- yaml --- r: 291735 b: refs/heads/master c: 7d65fd76e78f16be60ec01f11ce56969627e7b63 h: refs/heads/master i: 291733: d7d3a564db6cf8ac57420c5474ae10951fc15d73 291731: 980f3ded12fdfef77f237425f8fd938db0863e77 291727: d477034d0bb35bedb456e407f4b06645f028a3e9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/hostap/hostap_hw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0652f670d20f..86cd04e3ebdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 933025492f2d6d42c5c7c4df635291a52fd41904 +refs/heads/master: 7d65fd76e78f16be60ec01f11ce56969627e7b63 diff --git a/trunk/drivers/net/wireless/hostap/hostap_hw.c b/trunk/drivers/net/wireless/hostap/hostap_hw.c index a8bddd81b4d1..682df855bd85 100644 --- a/trunk/drivers/net/wireless/hostap/hostap_hw.c +++ b/trunk/drivers/net/wireless/hostap/hostap_hw.c @@ -1470,7 +1470,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial) * before it starts acting as an AP, so reset port automatically * here just in case */ if (initial && prism2_reset_port(dev)) { - printk("%s: MAC port 0 reseting failed\n", dev->name); + printk("%s: MAC port 0 resetting failed\n", dev->name); return 1; } @@ -1561,7 +1561,7 @@ static void prism2_hw_reset(struct net_device *dev) static long last_reset = 0; /* do not reset card more than once per second to avoid ending up in a - * busy loop reseting the card */ + * busy loop resetting the card */ if (time_before_eq(jiffies, last_reset + HZ)) return; last_reset = jiffies;