diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-21 01:56:56 -0700 |
| commit | f8f2109d4f6c525f893f6f2901ae62372e83245e (patch) | |
| tree | e20b095973d45eb2360ffa157ad161536c2ddbe9 /drivers/net/wireless/at76c50x-usb.c | |
| parent | bb81b2ddfa194b6d12761a350b5b5985cecae0a9 (diff) | |
| parent | a2c3f6567c9ac327f1ef1272551f3a7595ec885e (diff) | |
| download | blackbird-op-linux-f8f2109d4f6c525f893f6f2901ae62372e83245e.tar.gz blackbird-op-linux-f8f2109d4f6c525f893f6f2901ae62372e83245e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 7218dbabad3e..8e1a55dec351 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1950,9 +1950,8 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed) { struct at76_priv *priv = hw->priv; - at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d", - __func__, hw->conf.channel->hw_value, - hw->conf.radio_enabled); + at76_dbg(DBG_MAC80211, "%s(): channel %d", + __func__, hw->conf.channel->hw_value); at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); mutex_lock(&priv->mtx); @@ -1997,15 +1996,14 @@ static void at76_bss_info_changed(struct ieee80211_hw *hw, /* must be atomic */ static void at76_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, - unsigned int *total_flags, int mc_count, - struct dev_addr_list *mc_list) + unsigned int *total_flags, u64 multicast) { struct at76_priv *priv = hw->priv; int flags; at76_dbg(DBG_MAC80211, "%s(): changed_flags=0x%08x " - "total_flags=0x%08x mc_count=%d", - __func__, changed_flags, *total_flags, mc_count); + "total_flags=0x%08x", + __func__, changed_flags, *total_flags); flags = changed_flags & AT76_SUPPORTED_FILTERS; *total_flags = AT76_SUPPORTED_FILTERS; |
