diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
| commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
| tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /drivers/net/wireless/iwlegacy/common.c | |
| parent | Merge tag 'fcoe' into fixes (diff) | |
| parent | fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs (diff) | |
| download | linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.tar.xz linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.zip | |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 592d0aa634a8..e9a3cbc409ae 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -1423,7 +1423,7 @@ il_setup_rx_scan_handlers(struct il_priv *il) } EXPORT_SYMBOL(il_setup_rx_scan_handlers); -inline u16 +u16 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band, u8 n_probes) { |