diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 20:09:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 20:09:54 +0200 |
| commit | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (patch) | |
| tree | 144b686bf3fd6512a55987da2d911f739646ce02 /drivers/net/wireless/b43/b43.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | mac80211: make ieee802_11_parse_elems an inline (diff) | |
| download | linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.tar.xz linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
| -rw-r--r-- | drivers/net/wireless/b43/b43.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index f5e840104f4b..7f3d461f7e8d 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -980,7 +980,7 @@ static inline int b43_is_mode(struct b43_wl *wl, int type) */ static inline enum ieee80211_band b43_current_band(struct b43_wl *wl) { - return wl->hw->conf.channel->band; + return wl->hw->conf.chandef.chan->band; } static inline int b43_bus_may_powerdown(struct b43_wldev *wldev) |