diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-11 14:34:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-11 14:34:06 -0400 |
commit | 14599f1e341ee219abdd15f4eee5872d6f2d29f1 (patch) | |
tree | 3875181429010e58416ab34e6c06ef42de52e756 /net/mac80211/ieee80211_i.h | |
parent | d8d1f30b95a635dbd610dcc5eb641aca8f4768cf (diff) | |
parent | 832c10fd733893f86c63bde1c65b005d5a2fe346 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ec3e5c3e27b..1e779e83347 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -746,10 +746,10 @@ struct ieee80211_local { | |||
746 | struct mutex iflist_mtx; | 746 | struct mutex iflist_mtx; |
747 | 747 | ||
748 | /* | 748 | /* |
749 | * Key lock, protects sdata's key_list and sta_info's | 749 | * Key mutex, protects sdata's key_list and sta_info's |
750 | * key pointers (write access, they're RCU.) | 750 | * key pointers (write access, they're RCU.) |
751 | */ | 751 | */ |
752 | spinlock_t key_lock; | 752 | struct mutex key_mtx; |
753 | 753 | ||
754 | 754 | ||
755 | /* Scanning and BSS list */ | 755 | /* Scanning and BSS list */ |
@@ -851,6 +851,7 @@ struct ieee80211_local { | |||
851 | struct work_struct dynamic_ps_disable_work; | 851 | struct work_struct dynamic_ps_disable_work; |
852 | struct timer_list dynamic_ps_timer; | 852 | struct timer_list dynamic_ps_timer; |
853 | struct notifier_block network_latency_notifier; | 853 | struct notifier_block network_latency_notifier; |
854 | struct notifier_block ifa_notifier; | ||
854 | 855 | ||
855 | int user_power_level; /* in dBm */ | 856 | int user_power_level; /* in dBm */ |
856 | int power_constr_level; /* in dBm */ | 857 | int power_constr_level; /* in dBm */ |
@@ -988,6 +989,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, | |||
988 | int ieee80211_mgd_action(struct ieee80211_sub_if_data *sdata, | 989 | int ieee80211_mgd_action(struct ieee80211_sub_if_data *sdata, |
989 | struct ieee80211_channel *chan, | 990 | struct ieee80211_channel *chan, |
990 | enum nl80211_channel_type channel_type, | 991 | enum nl80211_channel_type channel_type, |
992 | bool channel_type_valid, | ||
991 | const u8 *buf, size_t len, u64 *cookie); | 993 | const u8 *buf, size_t len, u64 *cookie); |
992 | ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, | 994 | ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, |
993 | struct sk_buff *skb); | 995 | struct sk_buff *skb); |
@@ -996,6 +998,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local, | |||
996 | void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency); | 998 | void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency); |
997 | int ieee80211_max_network_latency(struct notifier_block *nb, | 999 | int ieee80211_max_network_latency(struct notifier_block *nb, |
998 | unsigned long data, void *dummy); | 1000 | unsigned long data, void *dummy); |
1001 | int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata); | ||
999 | void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, | 1002 | void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, |
1000 | struct ieee80211_channel_sw_ie *sw_elem, | 1003 | struct ieee80211_channel_sw_ie *sw_elem, |
1001 | struct ieee80211_bss *bss, | 1004 | struct ieee80211_bss *bss, |