diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 10:39:27 -0400 |
| commit | d3641409a05dcb8e28116bb2ad638f5a42805d9d (patch) | |
| tree | 1d43a5e0129709502edb631a4fd66de369ee5620 /drivers/net/wireless/iwlegacy/common.c | |
| parent | 953c96e0d85615d1ab1f100e525d376053294dc2 (diff) | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 5b79819d7bed..3613b3a81ad2 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
| @@ -4701,8 +4701,7 @@ out: | |||
| 4701 | } | 4701 | } |
| 4702 | EXPORT_SYMBOL(il_mac_change_interface); | 4702 | EXPORT_SYMBOL(il_mac_change_interface); |
| 4703 | 4703 | ||
| 4704 | void | 4704 | void il_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop) |
| 4705 | il_mac_flush(struct ieee80211_hw *hw, bool drop) | ||
| 4706 | { | 4705 | { |
| 4707 | struct il_priv *il = hw->priv; | 4706 | struct il_priv *il = hw->priv; |
| 4708 | unsigned long timeout = jiffies + msecs_to_jiffies(500); | 4707 | unsigned long timeout = jiffies + msecs_to_jiffies(500); |