forked from Minki/linux
bc1d0411b8
When VLAN header stripping is used, packets currently bypass packet sockets (and other network taps) completely. For locally existing VLANs, they appear directly on the VLAN device, for unknown VLANs they are silently dropped. Add a new function netif_nit_deliver() to deliver incoming packets to all network interface taps and use it in __vlan_hwaccel_rx() to make VLAN packets visible on the underlying device. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/if_vlan.h>
|
|
#include "vlan.h"
|
|
|
|
/* VLAN rx hw acceleration helper. This acts like netif_{rx,receive_skb}(). */
|
|
int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
|
|
u16 vlan_tci, int polling)
|
|
{
|
|
struct net_device_stats *stats;
|
|
|
|
if (skb_bond_should_drop(skb)) {
|
|
dev_kfree_skb_any(skb);
|
|
return NET_RX_DROP;
|
|
}
|
|
|
|
skb->vlan_tci = vlan_tci;
|
|
netif_nit_deliver(skb);
|
|
|
|
skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
|
|
if (skb->dev == NULL) {
|
|
dev_kfree_skb_any(skb);
|
|
/* Not NET_RX_DROP, this is not being dropped
|
|
* due to congestion. */
|
|
return NET_RX_SUCCESS;
|
|
}
|
|
skb->dev->last_rx = jiffies;
|
|
skb->vlan_tci = 0;
|
|
|
|
stats = &skb->dev->stats;
|
|
stats->rx_packets++;
|
|
stats->rx_bytes += skb->len;
|
|
|
|
skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
|
|
switch (skb->pkt_type) {
|
|
case PACKET_BROADCAST:
|
|
break;
|
|
case PACKET_MULTICAST:
|
|
stats->multicast++;
|
|
break;
|
|
case PACKET_OTHERHOST:
|
|
/* Our lower layer thinks this is not local, let's make sure.
|
|
* This allows the VLAN to have a different MAC than the
|
|
* underlying device, and still route correctly. */
|
|
if (!compare_ether_addr(eth_hdr(skb)->h_dest,
|
|
skb->dev->dev_addr))
|
|
skb->pkt_type = PACKET_HOST;
|
|
break;
|
|
};
|
|
return (polling ? netif_receive_skb(skb) : netif_rx(skb));
|
|
}
|
|
EXPORT_SYMBOL(__vlan_hwaccel_rx);
|
|
|
|
struct net_device *vlan_dev_real_dev(const struct net_device *dev)
|
|
{
|
|
return vlan_dev_info(dev)->real_dev;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vlan_dev_real_dev);
|
|
|
|
u16 vlan_dev_vlan_id(const struct net_device *dev)
|
|
{
|
|
return vlan_dev_info(dev)->vlan_id;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vlan_dev_vlan_id);
|