diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
| commit | 359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch) | |
| tree | 2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /drivers/net/wireless/zd1211rw/zd_mac.h | |
| parent | 0efdf2626676db4b30d343ff88f8461ad09130da (diff) | |
| parent | 720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Conflicts:
drivers/net/wireless/zd1211rw/zd_mac.h
net/ieee80211/softmac/ieee80211softmac_assoc.c
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index d4e8b870409..f0cf05dc7d3 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h @@ -133,6 +133,8 @@ struct zd_mac { struct iw_statistics iw_stats; struct housekeeping housekeeping; + struct work_struct set_multicast_hash_work; + struct zd_mc_hash multicast_hash; struct delayed_work set_rts_cts_work; struct delayed_work set_basic_rates_work; @@ -189,6 +191,7 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type); int zd_mac_open(struct net_device *netdev); int zd_mac_stop(struct net_device *netdev); int zd_mac_set_mac_address(struct net_device *dev, void *p); +void zd_mac_set_multicast_list(struct net_device *netdev); int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length); |