From: johannes@sipsolutions.net
To: linux-wireless@vger.kernel.org
Subject: [PATCH 5/5] bcm43xx-d80211: update for wiphy api
Date: Fri, 09 Feb 2007 17:24:19 +0100 [thread overview]
Message-ID: <20070209162528.637446000@sipsolutions.net> (raw)
In-Reply-To: 20070209162414.043158000@sipsolutions.net
update bcm43xx-d80211.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c | 2 +-
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 15 ++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
--- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c 2007-02-09 17:08:20.133840519 +0100
+++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c 2007-02-09 17:09:00.763840519 +0100
@@ -308,7 +308,7 @@ void bcm43xx_debugfs_add_device(struct b
dev->dfsentry = e;
- snprintf(devdir, sizeof(devdir), "wiphy%d", dev->wl->hw->index);
+ snprintf(devdir, sizeof(devdir), "wiphy%d", dev->wl->hw->wiphy->wiphy_index);
e->subdir = debugfs_create_dir(devdir, fs.root);
e->dentry_tsf = debugfs_create_file("tsf", 0666, e->subdir,
dev, &tsf_fops);
--- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c 2007-02-09 17:08:20.213840519 +0100
+++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c 2007-02-09 17:09:00.773840519 +0100
@@ -3166,7 +3166,7 @@ static int bcm43xx_wireless_core_init(st
ssb_chipco_set_clockmode(chipco, SSB_CLKMODE_DYNAMIC);
bcm43xx_macfilter_clear(dev, BCM43xx_MACFILTER_ASSOC);
bcm43xx_macfilter_set(dev, BCM43xx_MACFILTER_SELF,
- (u8 *)(wl->hw->perm_addr));
+ (u8 *)(wl->hw->wiphy->perm_addr));
bcm43xx_security_init(dev);
bcm43xx_measure_channel_change_time(dev);
@@ -3562,14 +3562,11 @@ static int bcm43xx_wireless_init(struct
IEEE80211_HW_WEP_INCLUDE_IV;
hw->maxssi = BCM43xx_RX_MAX_SSI;
hw->queues = 1;
- hw->dev = &dev->dev;
- if (is_valid_ether_addr(sprom->r1.et1mac)) {
- memcpy(hw->perm_addr, sprom->r1.et1mac,
- ARRAY_SIZE(hw->perm_addr));
- } else {
- memcpy(hw->perm_addr, sprom->r1.il0mac,
- ARRAY_SIZE(hw->perm_addr));
- }
+ SET_IEEE80211_DEV(hw, &dev->dev);
+ if (is_valid_ether_addr(sprom->r1.et1mac))
+ SET_IEEE80211_PERM_ADDR(hw, sprom->r1.et1mac);
+ else
+ SET_IEEE80211_PERM_ADDR(hw, sprom->r1.il0mac);
/* Get and initialize struct bcm43xx_wl */
wl = hw_to_bcm43xx_wl(hw);
--
prev parent reply other threads:[~2007-02-09 16:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-09 16:24 [PATCH 0/5] cfg80211 changes for wireless-dev johannes
2007-02-09 16:24 ` [PATCH 1/5] cfg80211: update to code submitted to mainline johannes
2007-02-11 13:13 ` Johannes Berg
2007-02-09 16:24 ` [PATCH 2/5] wext: clean up johannes
2007-02-09 16:24 ` [PATCH 3/5] d80211: update for wiphy api johannes
2007-02-09 16:24 ` [PATCH 4/5] zd1211rw-d80211: " johannes
2007-02-09 16:24 ` johannes [this message]
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=20070209162528.637446000@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@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).