diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-14 17:08:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-08-17 16:29:46 -0700 |
| commit | 7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176 (patch) | |
| tree | 09cf48c5f48bdee89b7a2579ba4c7b072ca842e9 /include/linux/if_vlan.h | |
| parent | 774bd8613d0188cda72408f8ffce258d73953cad (diff) | |
| download | linux-7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176.tar.gz linux-7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176.tar.bz2 linux-7ea49ed73c8d0d0bdf7c11fc18c61572d2d22176.zip | |
[VLAN]: Make sure bonding packet drop checks get done in hwaccel RX path.
Since __vlan_hwaccel_rx() is essentially bypassing the
netif_receive_skb() call that would have occurred if we did the VLAN
decapsulation in software, we are missing the skb_bond() call and the
assosciated checks it does.
Export those checks via an inline function, skb_bond_should_drop(),
and use this in __vlan_hwaccel_rx().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_vlan.h')
| -rw-r--r-- | include/linux/if_vlan.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 383627ad328f..ab2740832742 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -155,6 +155,11 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, { struct net_device_stats *stats; + if (skb_bond_should_drop(skb)) { + dev_kfree_skb_any(skb); + return NET_RX_DROP; + } + skb->dev = grp->vlan_devices[vlan_tag & VLAN_VID_MASK]; if (skb->dev == NULL) { dev_kfree_skb_any(skb); |