diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 08:40:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-14 14:30:07 -0400 |
commit | 9d139c810a2aa17365cc548d0cd2a189d8433c65 (patch) | |
tree | ef10ca55f93689ab97368376d277102d2527c961 /drivers/net/wireless/rt2x00/rt2500pci.c | |
parent | f3947e2dfa3b18f375b7acd03b7ee2877d0751fc (diff) |
mac80211: revamp beacon configuration
This patch changes mac80211's beacon configuration handling
to never pass skbs to the driver directly but rather always
require the driver to use ieee80211_beacon_get(). Additionally,
it introduces "change flags" on the config_interface() call
to enable drivers to figure out what is changing. Finally, it
removes the beacon_update() driver callback in favour of
having IBSS beacon delivered by ieee80211_beacon_get() as well.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 0423c251c78e..a64bb18322e9 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
@@ -1875,7 +1875,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { | |||
1875 | .conf_tx = rt2x00mac_conf_tx, | 1875 | .conf_tx = rt2x00mac_conf_tx, |
1876 | .get_tx_stats = rt2x00mac_get_tx_stats, | 1876 | .get_tx_stats = rt2x00mac_get_tx_stats, |
1877 | .get_tsf = rt2500pci_get_tsf, | 1877 | .get_tsf = rt2500pci_get_tsf, |
1878 | .beacon_update = rt2500pci_beacon_update, | ||
1879 | .tx_last_beacon = rt2500pci_tx_last_beacon, | 1878 | .tx_last_beacon = rt2500pci_tx_last_beacon, |
1880 | }; | 1879 | }; |
1881 | 1880 | ||
@@ -1895,6 +1894,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { | |||
1895 | .write_tx_data = rt2x00pci_write_tx_data, | 1894 | .write_tx_data = rt2x00pci_write_tx_data, |
1896 | .kick_tx_queue = rt2500pci_kick_tx_queue, | 1895 | .kick_tx_queue = rt2500pci_kick_tx_queue, |
1897 | .fill_rxdone = rt2500pci_fill_rxdone, | 1896 | .fill_rxdone = rt2500pci_fill_rxdone, |
1897 | .beacon_update = rt2500pci_beacon_update, | ||
1898 | .config_filter = rt2500pci_config_filter, | 1898 | .config_filter = rt2500pci_config_filter, |
1899 | .config_intf = rt2500pci_config_intf, | 1899 | .config_intf = rt2500pci_config_intf, |
1900 | .config_erp = rt2500pci_config_erp, | 1900 | .config_erp = rt2500pci_config_erp, |