aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00dev.c
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-01-06 17:40:49 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:25 -0500
commit3c4f2085e5d82639004406795653e1e4dd6720e0 (patch)
tree439cde40c92b581cf56c81ce8806126a4eee4867 /drivers/net/wireless/rt2x00/rt2x00dev.c
parente37ea2135be080dd25f1a2644c9132c109fa77d1 (diff)
rt2x00: Move packet filter flags
The packet filter flags don't belong in the interface structure because they are device based instead of interface based. So move the filter fields out of struct interface and into rt2x00_dev. Additionally we shouldn't change the filter based on the working mode, if such a thing is needed than mac80211 should have done that. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index cea2bd91ff5f..911060df8037 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -417,7 +417,7 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
417{ 417{
418 struct rt2x00_dev *rt2x00dev = 418 struct rt2x00_dev *rt2x00dev =
419 container_of(work, struct rt2x00_dev, filter_work); 419 container_of(work, struct rt2x00_dev, filter_work);
420 unsigned int filter = rt2x00dev->interface.filter; 420 unsigned int filter = rt2x00dev->packet_filter;
421 421
422 /* 422 /*
423 * Since we had stored the filter inside interface.filter, 423 * Since we had stored the filter inside interface.filter,
@@ -425,7 +425,7 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
425 * assume nothing has changed (*total_flags will be compared 425 * assume nothing has changed (*total_flags will be compared
426 * to interface.filter to determine if any action is required). 426 * to interface.filter to determine if any action is required).
427 */ 427 */
428 rt2x00dev->interface.filter = 0; 428 rt2x00dev->packet_filter = 0;
429 429
430 rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw, 430 rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw,
431 filter, &filter, 0, NULL); 431 filter, &filter, 0, NULL);