diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-04-01 17:22:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:22:15 -0400 |
commit | 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch) | |
tree | b6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/net/wireless/wl12xx/wl1271_main.c | |
parent | a748ee2426817a95b1f03012d8f339c45c722ae1 (diff) |
net: convert multicast list to list_head
Converts the list and the core manipulating with it to be the same as uc_list.
+uses two functions for adding/removing mc address (normal and "global"
variant) instead of a function parameter.
+removes dev_mcast.c completely.
+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for
manipulation with lists on a sandbox (used in bonding and 80211 drivers)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 3daba6c0c77..6036d0206fe 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1266,11 +1266,11 @@ struct wl1271_filter_params { | |||
1266 | u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; | 1266 | u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; |
1267 | }; | 1267 | }; |
1268 | 1268 | ||
1269 | static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, | 1269 | static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, |
1270 | struct dev_addr_list *mc_list) | 1270 | struct netdev_hw_addr_list *mc_list) |
1271 | { | 1271 | { |
1272 | struct wl1271_filter_params *fp; | 1272 | struct wl1271_filter_params *fp; |
1273 | int i; | 1273 | struct netdev_hw_addr *ha; |
1274 | 1274 | ||
1275 | fp = kzalloc(sizeof(*fp), GFP_ATOMIC); | 1275 | fp = kzalloc(sizeof(*fp), GFP_ATOMIC); |
1276 | if (!fp) { | 1276 | if (!fp) { |
@@ -1279,21 +1279,16 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, | |||
1279 | } | 1279 | } |
1280 | 1280 | ||
1281 | /* update multicast filtering parameters */ | 1281 | /* update multicast filtering parameters */ |
1282 | fp->enabled = true; | ||
1283 | if (mc_count > ACX_MC_ADDRESS_GROUP_MAX) { | ||
1284 | mc_count = 0; | ||
1285 | fp->enabled = false; | ||
1286 | } | ||
1287 | |||
1288 | fp->mc_list_length = 0; | 1282 | fp->mc_list_length = 0; |
1289 | for (i = 0; i < mc_count; i++) { | 1283 | if (netdev_hw_addr_list_count(mc_list) > ACX_MC_ADDRESS_GROUP_MAX) { |
1290 | if (mc_list->da_addrlen == ETH_ALEN) { | 1284 | fp->enabled = false; |
1285 | } else { | ||
1286 | fp->enabled = true; | ||
1287 | netdev_hw_addr_list_for_each(ha, mc_list) { | ||
1291 | memcpy(fp->mc_list[fp->mc_list_length], | 1288 | memcpy(fp->mc_list[fp->mc_list_length], |
1292 | mc_list->da_addr, ETH_ALEN); | 1289 | ha->addr, ETH_ALEN); |
1293 | fp->mc_list_length++; | 1290 | fp->mc_list_length++; |
1294 | } else | 1291 | } |
1295 | wl1271_warning("Unknown mc address length."); | ||
1296 | mc_list = mc_list->next; | ||
1297 | } | 1292 | } |
1298 | 1293 | ||
1299 | return (u64)(unsigned long)fp; | 1294 | return (u64)(unsigned long)fp; |