2008-07-08 10:23:36 +00:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/if_vlan.h>
|
2009-03-01 08:11:52 +00:00
|
|
|
#include <linux/netpoll.h>
|
2011-07-15 15:47:34 +00:00
|
|
|
#include <linux/export.h>
|
2008-07-08 10:23:36 +00:00
|
|
|
#include "vlan.h"
|
|
|
|
|
vlan: don't deliver frames for unknown vlans to protocols
6a32e4f9dd9219261f8856f817e6655114cfec2f made the vlan code skip marking
vlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if
there was an rx_handler, as the rx_handler could cause the frame to be received
on a different (virtual) vlan-capable interface where that vlan might be
configured.
As rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause
frames for unknown vlans to be delivered to the protocol stack as if they had
been received untagged.
For example, if an ipv6 router advertisement that's tagged for a locally not
configured vlan is received on an interface with macvlan interfaces attached,
macvlan's rx_handler returns RX_HANDLER_PASS after delivering the frame to the
macvlan interfaces, which caused it to be passed to the protocol stack, leading
to ipv6 addresses for the announced prefix being configured even though those
are completely unusable on the underlying interface.
The fix moves marking as PACKET_OTHERHOST after the rx_handler so the
rx_handler, if there is one, sees the frame unchanged, but afterwards,
before the frame is delivered to the protocol stack, it gets marked whether
there is an rx_handler or not.
Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-10-07 15:51:58 +00:00
|
|
|
bool vlan_do_receive(struct sk_buff **skbp)
|
2008-07-08 10:23:36 +00:00
|
|
|
{
|
2010-10-20 13:56:06 +00:00
|
|
|
struct sk_buff *skb = *skbp;
|
2013-04-19 02:04:30 +00:00
|
|
|
__be16 vlan_proto = skb->vlan_proto;
|
2013-07-18 14:19:26 +00:00
|
|
|
u16 vlan_id = vlan_tx_tag_get_id(skb);
|
vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
- Without the 8021q module loaded in the kernel, all 802.1p packets
(VLAN 0 but QoS tagging) are silently discarded (as expected, as
the protocol is not loaded).
- Without this patch in 8021q module, these packets are forwarded to
the module, but they are discarded also if VLAN 0 is not configured,
which should not be the default behaviour, as VLAN 0 is not really
a VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost
impossible to communicate with mixed 802.1p and non 802.1p devices on
the same network due to arp table issues.
- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN
is 0 and we have not defined a VLAN with ID 0, but we accept the
packet with the encapsulated proto and pass it later to netif_rx.
- In the vlan device event handler, added some logic to add VLAN 0
to HW filter in devices that support it (this prevented any traffic
in VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,
and probably also with other HW filtered cards, so we fix it here).
- In the vlan unregister logic, prevent the elimination of VLAN 0
in devices with HW filter.
- The default behaviour is to ignore the VLAN 0 tagging and accept
the packet as if it was not tagged, but we can still define a
VLAN 0 if desired (so it is backwards compatible).
Signed-off-by: Pedro Garcia <pedro.netdev@dondevamos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-18 22:38:44 +00:00
|
|
|
struct net_device *vlan_dev;
|
2010-11-10 23:42:00 +00:00
|
|
|
struct vlan_pcpu_stats *rx_stats;
|
2008-07-08 10:23:36 +00:00
|
|
|
|
2013-04-19 02:04:30 +00:00
|
|
|
vlan_dev = vlan_find_dev(skb->dev, vlan_proto, vlan_id);
|
vlan: don't deliver frames for unknown vlans to protocols
6a32e4f9dd9219261f8856f817e6655114cfec2f made the vlan code skip marking
vlan-tagged frames for not locally configured vlans as PACKET_OTHERHOST if
there was an rx_handler, as the rx_handler could cause the frame to be received
on a different (virtual) vlan-capable interface where that vlan might be
configured.
As rx_handlers do not necessarily return RX_HANDLER_ANOTHER, this could cause
frames for unknown vlans to be delivered to the protocol stack as if they had
been received untagged.
For example, if an ipv6 router advertisement that's tagged for a locally not
configured vlan is received on an interface with macvlan interfaces attached,
macvlan's rx_handler returns RX_HANDLER_PASS after delivering the frame to the
macvlan interfaces, which caused it to be passed to the protocol stack, leading
to ipv6 addresses for the announced prefix being configured even though those
are completely unusable on the underlying interface.
The fix moves marking as PACKET_OTHERHOST after the rx_handler so the
rx_handler, if there is one, sees the frame unchanged, but afterwards,
before the frame is delivered to the protocol stack, it gets marked whether
there is an rx_handler or not.
Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-10-07 15:51:58 +00:00
|
|
|
if (!vlan_dev)
|
2010-10-20 13:56:06 +00:00
|
|
|
return false;
|
2008-11-04 22:49:57 +00:00
|
|
|
|
2010-10-20 13:56:06 +00:00
|
|
|
skb = *skbp = skb_share_check(skb, GFP_ATOMIC);
|
|
|
|
if (unlikely(!skb))
|
|
|
|
return false;
|
2009-01-06 18:50:09 +00:00
|
|
|
|
2010-10-20 13:56:06 +00:00
|
|
|
skb->dev = vlan_dev;
|
2011-06-10 06:56:58 +00:00
|
|
|
if (skb->pkt_type == 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. */
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 18:56:47 +00:00
|
|
|
if (ether_addr_equal(eth_hdr(skb)->h_dest, vlan_dev->dev_addr))
|
2011-06-10 06:56:58 +00:00
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
}
|
|
|
|
|
2011-12-08 04:11:15 +00:00
|
|
|
if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR)) {
|
2011-06-10 06:56:58 +00:00
|
|
|
unsigned int offset = skb->data - skb_mac_header(skb);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* vlan_insert_tag expect skb->data pointing to mac header.
|
|
|
|
* So change skb->data before calling it and change back to
|
|
|
|
* original position later
|
|
|
|
*/
|
|
|
|
skb_push(skb, offset);
|
2013-04-19 02:04:30 +00:00
|
|
|
skb = *skbp = vlan_insert_tag(skb, skb->vlan_proto,
|
|
|
|
skb->vlan_tci);
|
2011-06-10 06:56:58 +00:00
|
|
|
if (!skb)
|
|
|
|
return false;
|
|
|
|
skb_pull(skb, offset + VLAN_HLEN);
|
|
|
|
skb_reset_mac_len(skb);
|
|
|
|
}
|
|
|
|
|
2010-10-20 13:56:06 +00:00
|
|
|
skb->priority = vlan_get_ingress_priority(vlan_dev, skb->vlan_tci);
|
2008-07-15 05:49:30 +00:00
|
|
|
skb->vlan_tci = 0;
|
2008-07-08 10:23:36 +00:00
|
|
|
|
2011-12-08 04:11:15 +00:00
|
|
|
rx_stats = this_cpu_ptr(vlan_dev_priv(vlan_dev)->vlan_pcpu_stats);
|
2009-11-17 04:53:09 +00:00
|
|
|
|
2010-06-24 00:55:06 +00:00
|
|
|
u64_stats_update_begin(&rx_stats->syncp);
|
2009-11-17 04:53:09 +00:00
|
|
|
rx_stats->rx_packets++;
|
|
|
|
rx_stats->rx_bytes += skb->len;
|
2011-06-10 06:56:58 +00:00
|
|
|
if (skb->pkt_type == PACKET_MULTICAST)
|
2010-06-24 00:55:06 +00:00
|
|
|
rx_stats->rx_multicast++;
|
|
|
|
u64_stats_update_end(&rx_stats->syncp);
|
2010-10-20 13:56:06 +00:00
|
|
|
|
|
|
|
return true;
|
2008-07-08 10:23:36 +00:00
|
|
|
}
|
2008-07-08 10:23:57 +00:00
|
|
|
|
2013-01-03 22:48:59 +00:00
|
|
|
/* Must be invoked with rcu_read_lock. */
|
|
|
|
struct net_device *__vlan_find_dev_deep(struct net_device *dev,
|
2013-04-19 02:04:29 +00:00
|
|
|
__be16 vlan_proto, u16 vlan_id)
|
2011-07-20 04:54:05 +00:00
|
|
|
{
|
2013-01-03 22:48:59 +00:00
|
|
|
struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info);
|
2011-07-20 04:54:05 +00:00
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
if (vlan_info) {
|
2013-04-19 02:04:29 +00:00
|
|
|
return vlan_group_get_device(&vlan_info->grp,
|
|
|
|
vlan_proto, vlan_id);
|
2011-07-20 04:54:05 +00:00
|
|
|
} else {
|
|
|
|
/*
|
2013-01-03 22:48:59 +00:00
|
|
|
* Lower devices of master uppers (bonding, team) do not have
|
|
|
|
* grp assigned to themselves. Grp is assigned to upper device
|
|
|
|
* instead.
|
2011-07-20 04:54:05 +00:00
|
|
|
*/
|
2013-01-03 22:48:59 +00:00
|
|
|
struct net_device *upper_dev;
|
|
|
|
|
|
|
|
upper_dev = netdev_master_upper_dev_get_rcu(dev);
|
|
|
|
if (upper_dev)
|
2013-04-19 02:04:29 +00:00
|
|
|
return __vlan_find_dev_deep(upper_dev,
|
|
|
|
vlan_proto, vlan_id);
|
2011-07-20 04:54:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__vlan_find_dev_deep);
|
|
|
|
|
2008-07-08 10:23:57 +00:00
|
|
|
struct net_device *vlan_dev_real_dev(const struct net_device *dev)
|
|
|
|
{
|
2013-08-03 20:07:46 +00:00
|
|
|
struct net_device *ret = vlan_dev_priv(dev)->real_dev;
|
|
|
|
|
|
|
|
while (is_vlan_dev(ret))
|
|
|
|
ret = vlan_dev_priv(ret)->real_dev;
|
|
|
|
|
|
|
|
return ret;
|
2008-07-08 10:23:57 +00:00
|
|
|
}
|
2009-01-26 20:37:53 +00:00
|
|
|
EXPORT_SYMBOL(vlan_dev_real_dev);
|
2008-07-08 10:23:57 +00:00
|
|
|
|
|
|
|
u16 vlan_dev_vlan_id(const struct net_device *dev)
|
|
|
|
{
|
2011-12-08 04:11:15 +00:00
|
|
|
return vlan_dev_priv(dev)->vlan_id;
|
2008-07-08 10:23:57 +00:00
|
|
|
}
|
2009-01-26 20:37:53 +00:00
|
|
|
EXPORT_SYMBOL(vlan_dev_vlan_id);
|
2009-01-06 18:50:09 +00:00
|
|
|
|
2011-06-10 06:56:58 +00:00
|
|
|
static struct sk_buff *vlan_reorder_header(struct sk_buff *skb)
|
2011-04-07 19:48:33 +00:00
|
|
|
{
|
2011-06-10 06:56:58 +00:00
|
|
|
if (skb_cow(skb, skb_headroom(skb)) < 0)
|
|
|
|
return NULL;
|
|
|
|
memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN);
|
|
|
|
skb->mac_header += VLAN_HLEN;
|
2011-04-07 19:48:33 +00:00
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct sk_buff *vlan_untag(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct vlan_hdr *vhdr;
|
|
|
|
u16 vlan_tci;
|
|
|
|
|
|
|
|
if (unlikely(vlan_tx_tag_present(skb))) {
|
|
|
|
/* vlan_tci is already set-up so leave this for another time */
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb = skb_share_check(skb, GFP_ATOMIC);
|
|
|
|
if (unlikely(!skb))
|
|
|
|
goto err_free;
|
|
|
|
|
|
|
|
if (unlikely(!pskb_may_pull(skb, VLAN_HLEN)))
|
|
|
|
goto err_free;
|
|
|
|
|
|
|
|
vhdr = (struct vlan_hdr *) skb->data;
|
|
|
|
vlan_tci = ntohs(vhdr->h_vlan_TCI);
|
2013-04-19 02:04:30 +00:00
|
|
|
__vlan_hwaccel_put_tag(skb, skb->protocol, vlan_tci);
|
2011-04-07 19:48:33 +00:00
|
|
|
|
|
|
|
skb_pull_rcsum(skb, VLAN_HLEN);
|
|
|
|
vlan_set_encap_proto(skb, vhdr);
|
|
|
|
|
2011-06-10 06:56:58 +00:00
|
|
|
skb = vlan_reorder_header(skb);
|
2011-04-07 19:48:33 +00:00
|
|
|
if (unlikely(!skb))
|
|
|
|
goto err_free;
|
|
|
|
|
2011-08-19 04:29:27 +00:00
|
|
|
skb_reset_network_header(skb);
|
|
|
|
skb_reset_transport_header(skb);
|
2012-10-02 06:14:17 +00:00
|
|
|
skb_reset_mac_len(skb);
|
|
|
|
|
2011-04-07 19:48:33 +00:00
|
|
|
return skb;
|
|
|
|
|
|
|
|
err_free:
|
|
|
|
kfree_skb(skb);
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-02-13 12:00:14 +00:00
|
|
|
EXPORT_SYMBOL(vlan_untag);
|
2011-12-08 04:11:17 +00:00
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* vlan info and vid list
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void vlan_group_free(struct vlan_group *grp)
|
|
|
|
{
|
2013-04-20 23:34:40 +00:00
|
|
|
int i, j;
|
2011-12-08 04:11:18 +00:00
|
|
|
|
2013-04-20 23:34:40 +00:00
|
|
|
for (i = 0; i < VLAN_PROTO_NUM; i++)
|
|
|
|
for (j = 0; j < VLAN_GROUP_ARRAY_SPLIT_PARTS; j++)
|
|
|
|
kfree(grp->vlan_devices_arrays[i][j]);
|
2011-12-08 04:11:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_info_free(struct vlan_info *vlan_info)
|
|
|
|
{
|
|
|
|
vlan_group_free(&vlan_info->grp);
|
|
|
|
kfree(vlan_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_info_rcu_free(struct rcu_head *rcu)
|
|
|
|
{
|
|
|
|
vlan_info_free(container_of(rcu, struct vlan_info, rcu));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct vlan_info *vlan_info_alloc(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct vlan_info *vlan_info;
|
|
|
|
|
|
|
|
vlan_info = kzalloc(sizeof(struct vlan_info), GFP_KERNEL);
|
|
|
|
if (!vlan_info)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
vlan_info->real_dev = dev;
|
|
|
|
INIT_LIST_HEAD(&vlan_info->vid_list);
|
|
|
|
return vlan_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct vlan_vid_info {
|
|
|
|
struct list_head list;
|
2013-04-19 02:04:28 +00:00
|
|
|
__be16 proto;
|
|
|
|
u16 vid;
|
2011-12-08 04:11:18 +00:00
|
|
|
int refcount;
|
|
|
|
};
|
|
|
|
|
net: vlan: add 802.1ad support
Add support for 802.1ad VLAN devices. This mainly consists of checking for
ETH_P_8021AD in addition to ETH_P_8021Q in a couple of places and check
offloading capabilities based on the used protocol.
Configuration is done using "ip link":
# ip link add link eth0 eth0.1000 \
type vlan proto 802.1ad id 1000
# ip link add link eth0.1000 eth0.1000.1000 \
type vlan proto 802.1q id 1000
52:54:00:12:34:56 > 92:b1:54:28:e4:8c, ethertype 802.1Q (0x8100), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto ICMP (1), length 84)
20.1.0.2 > 20.1.0.1: ICMP echo request, id 3003, seq 8, length 64
92:b1:54:28:e4:8c > 52:54:00:12:34:56, ethertype 802.1Q-QinQ (0x88a8), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 47944, offset 0, flags [none], proto ICMP (1), length 84)
20.1.0.1 > 20.1.0.2: ICMP echo reply, id 3003, seq 8, length 64
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-19 02:04:31 +00:00
|
|
|
static bool vlan_hw_filter_capable(const struct net_device *dev,
|
|
|
|
const struct vlan_vid_info *vid_info)
|
|
|
|
{
|
|
|
|
if (vid_info->proto == htons(ETH_P_8021Q) &&
|
|
|
|
dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)
|
|
|
|
return true;
|
|
|
|
if (vid_info->proto == htons(ETH_P_8021AD) &&
|
|
|
|
dev->features & NETIF_F_HW_VLAN_STAG_FILTER)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
static struct vlan_vid_info *vlan_vid_info_get(struct vlan_info *vlan_info,
|
2013-04-19 02:04:28 +00:00
|
|
|
__be16 proto, u16 vid)
|
2011-12-08 04:11:18 +00:00
|
|
|
{
|
|
|
|
struct vlan_vid_info *vid_info;
|
|
|
|
|
|
|
|
list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
|
2013-04-19 02:04:28 +00:00
|
|
|
if (vid_info->proto == proto && vid_info->vid == vid)
|
2011-12-08 04:11:18 +00:00
|
|
|
return vid_info;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
static struct vlan_vid_info *vlan_vid_info_alloc(__be16 proto, u16 vid)
|
2011-12-08 04:11:18 +00:00
|
|
|
{
|
|
|
|
struct vlan_vid_info *vid_info;
|
|
|
|
|
|
|
|
vid_info = kzalloc(sizeof(struct vlan_vid_info), GFP_KERNEL);
|
|
|
|
if (!vid_info)
|
|
|
|
return NULL;
|
2013-04-19 02:04:28 +00:00
|
|
|
vid_info->proto = proto;
|
2011-12-08 04:11:18 +00:00
|
|
|
vid_info->vid = vid;
|
|
|
|
|
|
|
|
return vid_info;
|
|
|
|
}
|
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
static int __vlan_vid_add(struct vlan_info *vlan_info, __be16 proto, u16 vid,
|
2011-12-08 04:11:18 +00:00
|
|
|
struct vlan_vid_info **pvid_info)
|
2011-12-08 04:11:17 +00:00
|
|
|
{
|
2011-12-08 04:11:18 +00:00
|
|
|
struct net_device *dev = vlan_info->real_dev;
|
2011-12-08 04:11:17 +00:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2011-12-08 04:11:18 +00:00
|
|
|
struct vlan_vid_info *vid_info;
|
|
|
|
int err;
|
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
vid_info = vlan_vid_info_alloc(proto, vid);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (!vid_info)
|
|
|
|
return -ENOMEM;
|
2011-12-08 04:11:17 +00:00
|
|
|
|
net: vlan: add 802.1ad support
Add support for 802.1ad VLAN devices. This mainly consists of checking for
ETH_P_8021AD in addition to ETH_P_8021Q in a couple of places and check
offloading capabilities based on the used protocol.
Configuration is done using "ip link":
# ip link add link eth0 eth0.1000 \
type vlan proto 802.1ad id 1000
# ip link add link eth0.1000 eth0.1000.1000 \
type vlan proto 802.1q id 1000
52:54:00:12:34:56 > 92:b1:54:28:e4:8c, ethertype 802.1Q (0x8100), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto ICMP (1), length 84)
20.1.0.2 > 20.1.0.1: ICMP echo request, id 3003, seq 8, length 64
92:b1:54:28:e4:8c > 52:54:00:12:34:56, ethertype 802.1Q-QinQ (0x88a8), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 47944, offset 0, flags [none], proto ICMP (1), length 84)
20.1.0.1 > 20.1.0.2: ICMP echo reply, id 3003, seq 8, length 64
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-19 02:04:31 +00:00
|
|
|
if (vlan_hw_filter_capable(dev, vid_info)) {
|
2013-04-19 02:04:28 +00:00
|
|
|
err = ops->ndo_vlan_rx_add_vid(dev, proto, vid);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (err) {
|
|
|
|
kfree(vid_info);
|
|
|
|
return err;
|
|
|
|
}
|
2011-12-08 04:11:17 +00:00
|
|
|
}
|
2011-12-08 04:11:18 +00:00
|
|
|
list_add(&vid_info->list, &vlan_info->vid_list);
|
|
|
|
vlan_info->nr_vids++;
|
|
|
|
*pvid_info = vid_info;
|
2011-12-08 04:11:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2011-12-08 04:11:18 +00:00
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid)
|
2011-12-08 04:11:18 +00:00
|
|
|
{
|
|
|
|
struct vlan_info *vlan_info;
|
|
|
|
struct vlan_vid_info *vid_info;
|
|
|
|
bool vlan_info_created = false;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
vlan_info = rtnl_dereference(dev->vlan_info);
|
|
|
|
if (!vlan_info) {
|
|
|
|
vlan_info = vlan_info_alloc(dev);
|
|
|
|
if (!vlan_info)
|
|
|
|
return -ENOMEM;
|
|
|
|
vlan_info_created = true;
|
|
|
|
}
|
2013-04-19 02:04:28 +00:00
|
|
|
vid_info = vlan_vid_info_get(vlan_info, proto, vid);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (!vid_info) {
|
2013-04-19 02:04:28 +00:00
|
|
|
err = __vlan_vid_add(vlan_info, proto, vid, &vid_info);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (err)
|
|
|
|
goto out_free_vlan_info;
|
|
|
|
}
|
|
|
|
vid_info->refcount++;
|
|
|
|
|
|
|
|
if (vlan_info_created)
|
|
|
|
rcu_assign_pointer(dev->vlan_info, vlan_info);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_free_vlan_info:
|
|
|
|
if (vlan_info_created)
|
|
|
|
kfree(vlan_info);
|
|
|
|
return err;
|
|
|
|
}
|
2011-12-08 04:11:17 +00:00
|
|
|
EXPORT_SYMBOL(vlan_vid_add);
|
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
static void __vlan_vid_del(struct vlan_info *vlan_info,
|
|
|
|
struct vlan_vid_info *vid_info)
|
2011-12-08 04:11:17 +00:00
|
|
|
{
|
2011-12-08 04:11:18 +00:00
|
|
|
struct net_device *dev = vlan_info->real_dev;
|
2011-12-08 04:11:17 +00:00
|
|
|
const struct net_device_ops *ops = dev->netdev_ops;
|
2013-04-19 02:04:28 +00:00
|
|
|
__be16 proto = vid_info->proto;
|
|
|
|
u16 vid = vid_info->vid;
|
2011-12-08 04:11:18 +00:00
|
|
|
int err;
|
2011-12-08 04:11:17 +00:00
|
|
|
|
net: vlan: add 802.1ad support
Add support for 802.1ad VLAN devices. This mainly consists of checking for
ETH_P_8021AD in addition to ETH_P_8021Q in a couple of places and check
offloading capabilities based on the used protocol.
Configuration is done using "ip link":
# ip link add link eth0 eth0.1000 \
type vlan proto 802.1ad id 1000
# ip link add link eth0.1000 eth0.1000.1000 \
type vlan proto 802.1q id 1000
52:54:00:12:34:56 > 92:b1:54:28:e4:8c, ethertype 802.1Q (0x8100), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto ICMP (1), length 84)
20.1.0.2 > 20.1.0.1: ICMP echo request, id 3003, seq 8, length 64
92:b1:54:28:e4:8c > 52:54:00:12:34:56, ethertype 802.1Q-QinQ (0x88a8), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 47944, offset 0, flags [none], proto ICMP (1), length 84)
20.1.0.1 > 20.1.0.2: ICMP echo reply, id 3003, seq 8, length 64
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-19 02:04:31 +00:00
|
|
|
if (vlan_hw_filter_capable(dev, vid_info)) {
|
2013-04-19 02:04:28 +00:00
|
|
|
err = ops->ndo_vlan_rx_kill_vid(dev, proto, vid);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (err) {
|
2013-04-19 02:04:28 +00:00
|
|
|
pr_warn("failed to kill vid %04x/%d for device %s\n",
|
|
|
|
proto, vid, dev->name);
|
2011-12-08 04:11:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
list_del(&vid_info->list);
|
|
|
|
kfree(vid_info);
|
|
|
|
vlan_info->nr_vids--;
|
|
|
|
}
|
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid)
|
2011-12-08 04:11:18 +00:00
|
|
|
{
|
|
|
|
struct vlan_info *vlan_info;
|
|
|
|
struct vlan_vid_info *vid_info;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
vlan_info = rtnl_dereference(dev->vlan_info);
|
|
|
|
if (!vlan_info)
|
|
|
|
return;
|
|
|
|
|
2013-04-19 02:04:28 +00:00
|
|
|
vid_info = vlan_vid_info_get(vlan_info, proto, vid);
|
2011-12-08 04:11:18 +00:00
|
|
|
if (!vid_info)
|
|
|
|
return;
|
|
|
|
vid_info->refcount--;
|
|
|
|
if (vid_info->refcount == 0) {
|
|
|
|
__vlan_vid_del(vlan_info, vid_info);
|
|
|
|
if (vlan_info->nr_vids == 0) {
|
|
|
|
RCU_INIT_POINTER(dev->vlan_info, NULL);
|
|
|
|
call_rcu(&vlan_info->rcu, vlan_info_rcu_free);
|
|
|
|
}
|
2011-12-08 04:11:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(vlan_vid_del);
|
2011-12-08 04:11:19 +00:00
|
|
|
|
|
|
|
int vlan_vids_add_by_dev(struct net_device *dev,
|
|
|
|
const struct net_device *by_dev)
|
|
|
|
{
|
|
|
|
struct vlan_vid_info *vid_info;
|
2011-12-13 20:29:43 +00:00
|
|
|
struct vlan_info *vlan_info;
|
2011-12-08 04:11:19 +00:00
|
|
|
int err;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2011-12-13 20:29:43 +00:00
|
|
|
vlan_info = rtnl_dereference(by_dev->vlan_info);
|
|
|
|
if (!vlan_info)
|
2011-12-08 04:11:19 +00:00
|
|
|
return 0;
|
|
|
|
|
2011-12-13 20:29:43 +00:00
|
|
|
list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
|
2013-04-19 02:04:28 +00:00
|
|
|
err = vlan_vid_add(dev, vid_info->proto, vid_info->vid);
|
2011-12-08 04:11:19 +00:00
|
|
|
if (err)
|
|
|
|
goto unwind;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
unwind:
|
|
|
|
list_for_each_entry_continue_reverse(vid_info,
|
2011-12-13 20:29:43 +00:00
|
|
|
&vlan_info->vid_list,
|
2011-12-08 04:11:19 +00:00
|
|
|
list) {
|
2013-04-19 02:04:28 +00:00
|
|
|
vlan_vid_del(dev, vid_info->proto, vid_info->vid);
|
2011-12-08 04:11:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(vlan_vids_add_by_dev);
|
|
|
|
|
|
|
|
void vlan_vids_del_by_dev(struct net_device *dev,
|
|
|
|
const struct net_device *by_dev)
|
|
|
|
{
|
|
|
|
struct vlan_vid_info *vid_info;
|
2011-12-13 20:29:43 +00:00
|
|
|
struct vlan_info *vlan_info;
|
2011-12-08 04:11:19 +00:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2011-12-13 20:29:43 +00:00
|
|
|
vlan_info = rtnl_dereference(by_dev->vlan_info);
|
|
|
|
if (!vlan_info)
|
2011-12-08 04:11:19 +00:00
|
|
|
return;
|
|
|
|
|
2011-12-13 20:29:43 +00:00
|
|
|
list_for_each_entry(vid_info, &vlan_info->vid_list, list)
|
2013-04-19 02:04:28 +00:00
|
|
|
vlan_vid_del(dev, vid_info->proto, vid_info->vid);
|
2011-12-08 04:11:19 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(vlan_vids_del_by_dev);
|
2012-08-23 03:26:52 +00:00
|
|
|
|
|
|
|
bool vlan_uses_dev(const struct net_device *dev)
|
|
|
|
{
|
2012-10-14 04:30:56 +00:00
|
|
|
struct vlan_info *vlan_info;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
vlan_info = rtnl_dereference(dev->vlan_info);
|
|
|
|
if (!vlan_info)
|
|
|
|
return false;
|
|
|
|
return vlan_info->grp.nr_vlan_devs ? true : false;
|
2012-08-23 03:26:52 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(vlan_uses_dev);
|