lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qeth: l2 write unicast list to hardware

Browse Source 
In case the netdev unicast list contains additional entries we have
to register/deregister them.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Frank Blaschka
2008-08-15 08:02:59 +02:00
committed by Jeff Garzik
parent 211cd45ac7
commit 7db2266a37
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/s390/net/qeth_core.h
View File

@@ -689,6 +689,7 @@ struct qeth_mc_mac {
struct list_head list; struct list_head list;
__u8 mc_addr[MAX_ADDR_LEN]; __u8 mc_addr[MAX_ADDR_LEN];
unsigned char mc_addrlen; unsigned char mc_addrlen;
int is_vmac;
}; };
struct qeth_card { struct qeth_card {

27
drivers/s390/net/qeth_l2_main.c
View File

@@ -177,9 +177,10 @@ static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac)
qeth_l2_send_delgroupmac_cb); qeth_l2_send_delgroupmac_cb);
} }
static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac)
{ {
struct qeth_mc_mac *mc; struct qeth_mc_mac *mc;
int rc;
mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC);
@@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac)
memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); memcpy(mc->mc_addr, mac, OSA_ADDR_LEN);
mc->mc_addrlen = OSA_ADDR_LEN; mc->mc_addrlen = OSA_ADDR_LEN;
mc->is_vmac = vmac;
if (!qeth_l2_send_setgroupmac(card, mac)) if (vmac) {
rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC,
NULL);
} else {
rc = qeth_l2_send_setgroupmac(card, mac);
}
if (!rc)
list_add_tail(&mc->list, &card->mc_list); list_add_tail(&mc->list, &card->mc_list);
else else
kfree(mc); kfree(mc);
@@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card)
spin_lock_bh(&card->mclock); spin_lock_bh(&card->mclock);
list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { list_for_each_entry_safe(mc, tmp, &card->mc_list, list) {
qeth_l2_send_delgroupmac(card, mc->mc_addr); if (mc->is_vmac)
qeth_l2_send_setdelmac(card, mc->mc_addr,
IPA_CMD_DELVMAC, NULL);
else
qeth_l2_send_delgroupmac(card, mc->mc_addr);
list_del(&mc->list); list_del(&mc->list);
kfree(mc); kfree(mc);
} }
@@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
static void qeth_l2_set_multicast_list(struct net_device *dev) static void qeth_l2_set_multicast_list(struct net_device *dev)
{ {
struct qeth_card *card = dev->ml_priv; struct qeth_card *card = dev->ml_priv;
struct dev_mc_list *dm; struct dev_addr_list *dm;
if (card->info.type == QETH_CARD_TYPE_OSN) if (card->info.type == QETH_CARD_TYPE_OSN)
return ; return ;
@@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
qeth_l2_del_all_mc(card); qeth_l2_del_all_mc(card);
spin_lock_bh(&card->mclock); spin_lock_bh(&card->mclock);
for (dm = dev->mc_list; dm; dm = dm->next) for (dm = dev->mc_list; dm; dm = dm->next)
qeth_l2_add_mc(card, dm->dmi_addr); qeth_l2_add_mc(card, dm->da_addr, 0);
for (dm = dev->uc_list; dm; dm = dm->next)
qeth_l2_add_mc(card, dm->da_addr, 1);
spin_unlock_bh(&card->mclock); spin_unlock_bh(&card->mclock);
if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
return; return;