From: Jiri Benc <jbenc@suse.cz>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 1/12] d80211: Fix passing of invalid pointer
Date: Wed, 3 Jan 2007 19:05:08 +0100 (CET) [thread overview]
Message-ID: <20070103180508.F09143AA7E9@silver.suse.cz> (raw)
In-Reply-To: <20070103190418.710197000.midnight@suse.cz>
From: Michael Buesch <mb@bu3sch.de>
ieee80211_hw pointers have to be passed to ops->set_key()
and ops->get_tsf().
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
---
net/d80211/ieee80211_iface.c | 4 ++--
net/d80211/ieee80211_sta.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
0690925f2f99f6d43322ec8507eaabdcf1435c3c
diff --git a/net/d80211/ieee80211_iface.c b/net/d80211/ieee80211_iface.c
index 6b45895..cb1da56 100644
--- a/net/d80211/ieee80211_iface.c
+++ b/net/d80211/ieee80211_iface.c
@@ -227,8 +227,8 @@ #if 0
* really much point in disabling the keys at this point. */
memset(addr, 0xff, ETH_ALEN);
if (local->ops->set_key)
- local->ops->set_key(dev, DISABLE_KEY, addr,
- local->keys[i], 0);
+ local->ops->set_key(local_to_hw(local), DISABLE_KEY, addr,
+ local->keys[i], 0);
#endif
ieee80211_key_free(sdata->keys[i]);
}
diff --git a/net/d80211/ieee80211_sta.c b/net/d80211/ieee80211_sta.c
index df7a238..0d46c66 100644
--- a/net/d80211/ieee80211_sta.c
+++ b/net/d80211/ieee80211_sta.c
@@ -1362,7 +1362,7 @@ #ifdef CONFIG_D80211_IBSS_DEBUG
static unsigned long last_tsf_debug = 0;
u64 tsf;
if (local->ops->get_tsf)
- tsf = local->ops->get_tsf(local->mdev);
+ tsf = local->ops->get_tsf(local_to_hw(local));
else
tsf = -1LLU;
if (time_after(jiffies, last_tsf_debug + 5 * HZ)) {
--
1.3.0
next prev parent reply other threads:[~2007-01-03 18:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-03 18:05 [PATCH 0/12] d80211: pull request Jiri Benc
2007-01-03 18:05 ` Jiri Benc [this message]
2007-01-03 18:05 ` [PATCH 2/12] d80211: Fix 64bit printk warnings Jiri Benc
2007-01-03 18:05 ` [PATCH 3/12] d80211: fix classify_1d() priority selection Jiri Benc
2007-01-03 18:05 ` [PATCH 4/12] d80211: simplify classify_1d Jiri Benc
2007-01-03 18:05 ` [PATCH 5/12] d80211: Turn PHYmode list from an array into a linked list Jiri Benc
2007-01-03 18:05 ` [PATCH 6/12] d80211: add missing \n in skb queue warning Jiri Benc
2007-01-03 18:05 ` [PATCH 7/12] d80211: constify ieee80211_ops pointer Jiri Benc
2007-01-03 18:05 ` [PATCH 8/12] d80211: small documentation fix Jiri Benc
2007-01-03 18:05 ` [PATCH 9/12] d80211: do not cancel uninitialized work Jiri Benc
2007-01-03 18:05 ` [PATCH 10/12] d80211: clear ifsta->associated flag when authentication starts Jiri Benc
2007-01-03 18:05 ` [PATCH 11/12] d80211: inhibit duplicate authentication requests when setting bssid Jiri Benc
2007-01-03 18:05 ` [PATCH 12/12] d80211: Reinit keys on mode change Jiri Benc
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=20070103180508.F09143AA7E9@silver.suse.cz \
--to=jbenc@suse.cz \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).