Commit e0d138d9 authored by Shahed Shaikh's avatar Shahed Shaikh Committed by David S. Miller

qlcnic: Fix ingress MAC learning

o Delete MAC address from the adapter's filter table
  if the source MAC address of ingress packet matches.
Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a99ab56
...@@ -161,37 +161,69 @@ static inline int qlcnic_82xx_is_lb_pkt(u64 sts_data) ...@@ -161,37 +161,69 @@ static inline int qlcnic_82xx_is_lb_pkt(u64 sts_data)
return (qlcnic_get_sts_status(sts_data) == STATUS_CKSUM_LOOP) ? 1 : 0; return (qlcnic_get_sts_status(sts_data) == STATUS_CKSUM_LOOP) ? 1 : 0;
} }
static void qlcnic_delete_rx_list_mac(struct qlcnic_adapter *adapter,
struct qlcnic_filter *fil,
void *addr, u16 vlan_id)
{
int ret;
u8 op;
op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD;
ret = qlcnic_sre_macaddr_change(adapter, addr, vlan_id, op);
if (ret)
return;
op = vlan_id ? QLCNIC_MAC_VLAN_DEL : QLCNIC_MAC_DEL;
ret = qlcnic_sre_macaddr_change(adapter, addr, vlan_id, op);
if (!ret) {
hlist_del(&fil->fnode);
adapter->rx_fhash.fnum--;
}
}
static struct qlcnic_filter *qlcnic_find_mac_filter(struct hlist_head *head,
void *addr, u16 vlan_id)
{
struct qlcnic_filter *tmp_fil = NULL;
struct hlist_node *n;
hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
if (!memcmp(tmp_fil->faddr, addr, ETH_ALEN) &&
tmp_fil->vlan_id == vlan_id)
return tmp_fil;
}
return NULL;
}
void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb, void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
int loopback_pkt, u16 vlan_id) int loopback_pkt, u16 vlan_id)
{ {
struct ethhdr *phdr = (struct ethhdr *)(skb->data); struct ethhdr *phdr = (struct ethhdr *)(skb->data);
struct qlcnic_filter *fil, *tmp_fil; struct qlcnic_filter *fil, *tmp_fil;
struct hlist_node *n;
struct hlist_head *head; struct hlist_head *head;
unsigned long time; unsigned long time;
u64 src_addr = 0; u64 src_addr = 0;
u8 hindex, found = 0, op; u8 hindex, op;
int ret; int ret;
memcpy(&src_addr, phdr->h_source, ETH_ALEN); memcpy(&src_addr, phdr->h_source, ETH_ALEN);
hindex = qlcnic_mac_hash(src_addr) &
(adapter->fhash.fbucket_size - 1);
if (loopback_pkt) { if (loopback_pkt) {
if (adapter->rx_fhash.fnum >= adapter->rx_fhash.fmax) if (adapter->rx_fhash.fnum >= adapter->rx_fhash.fmax)
return; return;
hindex = qlcnic_mac_hash(src_addr) &
(adapter->fhash.fbucket_size - 1);
head = &(adapter->rx_fhash.fhead[hindex]); head = &(adapter->rx_fhash.fhead[hindex]);
hlist_for_each_entry_safe(tmp_fil, n, head, fnode) { tmp_fil = qlcnic_find_mac_filter(head, &src_addr, vlan_id);
if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) && if (tmp_fil) {
tmp_fil->vlan_id == vlan_id) {
time = tmp_fil->ftime; time = tmp_fil->ftime;
if (jiffies > (QLCNIC_READD_AGE * HZ + time)) if (time_after(jiffies, QLCNIC_READD_AGE * HZ + time))
tmp_fil->ftime = jiffies; tmp_fil->ftime = jiffies;
return; return;
} }
}
fil = kzalloc(sizeof(struct qlcnic_filter), GFP_ATOMIC); fil = kzalloc(sizeof(struct qlcnic_filter), GFP_ATOMIC);
if (!fil) if (!fil)
...@@ -205,36 +237,37 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb, ...@@ -205,36 +237,37 @@ void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, struct sk_buff *skb,
adapter->rx_fhash.fnum++; adapter->rx_fhash.fnum++;
spin_unlock(&adapter->rx_mac_learn_lock); spin_unlock(&adapter->rx_mac_learn_lock);
} else { } else {
hindex = qlcnic_mac_hash(src_addr) & head = &adapter->fhash.fhead[hindex];
(adapter->fhash.fbucket_size - 1);
head = &(adapter->rx_fhash.fhead[hindex]);
spin_lock(&adapter->rx_mac_learn_lock);
hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
tmp_fil->vlan_id == vlan_id) {
found = 1;
break;
}
}
if (!found) { spin_lock(&adapter->mac_learn_lock);
spin_unlock(&adapter->rx_mac_learn_lock);
return;
}
op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD; tmp_fil = qlcnic_find_mac_filter(head, &src_addr, vlan_id);
ret = qlcnic_sre_macaddr_change(adapter, (u8 *)&src_addr, if (tmp_fil) {
vlan_id, op);
if (!ret) {
op = vlan_id ? QLCNIC_MAC_VLAN_DEL : QLCNIC_MAC_DEL; op = vlan_id ? QLCNIC_MAC_VLAN_DEL : QLCNIC_MAC_DEL;
ret = qlcnic_sre_macaddr_change(adapter, ret = qlcnic_sre_macaddr_change(adapter,
(u8 *)&src_addr, (u8 *)&src_addr,
vlan_id, op); vlan_id, op);
if (!ret) { if (!ret) {
hlist_del(&(tmp_fil->fnode)); hlist_del(&tmp_fil->fnode);
adapter->rx_fhash.fnum--; adapter->fhash.fnum--;
} }
spin_unlock(&adapter->mac_learn_lock);
return;
} }
spin_unlock(&adapter->mac_learn_lock);
head = &adapter->rx_fhash.fhead[hindex];
spin_lock(&adapter->rx_mac_learn_lock);
tmp_fil = qlcnic_find_mac_filter(head, &src_addr, vlan_id);
if (tmp_fil)
qlcnic_delete_rx_list_mac(adapter, tmp_fil, &src_addr,
vlan_id);
spin_unlock(&adapter->rx_mac_learn_lock); spin_unlock(&adapter->rx_mac_learn_lock);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment