netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Buesch <mb@bu3sch.de>
To: Jiri Benc <jbenc@suse.cz>, John Linville <linville@tuxdriver.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH] d80211: Fix passing of invalid pointer
Date: Wed, 13 Dec 2006 18:52:33 +0100	[thread overview]
Message-ID: <200612131852.33463.mb@bu3sch.de> (raw)

ieee80211_hw pointers have to be passed to ops->set_key()
and ops->get_tsf().

Signed-off-by: Michael Buesch <mb@bu3sch.de>

Index: jbenc-dscape.git/net/d80211/ieee80211_iface.c
===================================================================
--- jbenc-dscape.git.orig/net/d80211/ieee80211_iface.c	2006-12-13 13:23:56.000000000 +0100
+++ jbenc-dscape.git/net/d80211/ieee80211_iface.c	2006-12-13 18:46:33.000000000 +0100
@@ -228,8 +228,8 @@ void ieee80211_if_reinit(struct net_devi
 		 * 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]);
 	}
Index: jbenc-dscape.git/net/d80211/ieee80211_sta.c
===================================================================
--- jbenc-dscape.git.orig/net/d80211/ieee80211_sta.c	2006-12-13 18:42:47.000000000 +0100
+++ jbenc-dscape.git/net/d80211/ieee80211_sta.c	2006-12-13 18:50:14.000000000 +0100
@@ -1365,7 +1365,7 @@ static void ieee80211_rx_bss_info(struct
 		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)) {

-- 
Greetings Michael.

                 reply	other threads:[~2006-12-13 17:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=200612131852.33463.mb@bu3sch.de \
    --to=mb@bu3sch.de \
    --cc=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).