2005-04-16 22:20:36 +00:00
|
|
|
/* -*- linux-c -*-
|
|
|
|
* INET 802.1Q VLAN
|
|
|
|
* Ethernet-type device handling.
|
|
|
|
*
|
|
|
|
* Authors: Ben Greear <greearb@candelatech.com>
|
2008-01-21 08:27:00 +00:00
|
|
|
* Please send support related email to: netdev@vger.kernel.org
|
2005-04-16 22:20:36 +00:00
|
|
|
* VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
|
2007-02-09 14:24:25 +00:00
|
|
|
*
|
2005-04-16 22:20:36 +00:00
|
|
|
* Fixes: Mar 22 2001: Martin Bokaemper <mbokaemper@unispherenetworks.com>
|
|
|
|
* - reset skb->pkt_type on incoming packets when MAC was changed
|
|
|
|
* - see that changed MAC is saddr for outgoing packets
|
|
|
|
* Oct 20, 2001: Ard van Breeman:
|
|
|
|
* - Fix MC-list, finally.
|
|
|
|
* - Flush MC-list on VLAN destroy.
|
2007-02-09 14:24:25 +00:00
|
|
|
*
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
2008-07-08 10:22:42 +00:00
|
|
|
#include <linux/ethtool.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <net/arp.h>
|
|
|
|
|
|
|
|
#include "vlan.h"
|
|
|
|
#include "vlanproc.h"
|
|
|
|
#include <linux/if_vlan.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Rebuild the Ethernet MAC header. This is called after an ARP
|
|
|
|
* (or in future other address resolution) has completed on this
|
|
|
|
* sk_buff. We now let ARP fill in the other fields.
|
|
|
|
*
|
|
|
|
* This routine CANNOT use cached dst->neigh!
|
|
|
|
* Really, it is used only when dst->neigh is wrong.
|
|
|
|
*
|
|
|
|
* TODO: This needs a checkup, I'm ignorant here. --BLG
|
|
|
|
*/
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_rebuild_header(struct sk_buff *skb)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct net_device *dev = skb->dev;
|
|
|
|
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
|
|
|
|
|
|
|
|
switch (veth->h_vlan_encapsulated_proto) {
|
|
|
|
#ifdef CONFIG_INET
|
2008-09-21 05:20:49 +00:00
|
|
|
case htons(ETH_P_IP):
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* TODO: Confirm this will work with VLAN headers... */
|
|
|
|
return arp_find(veth->h_dest, skb);
|
2007-02-09 14:24:25 +00:00
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
default:
|
2008-01-21 08:24:30 +00:00
|
|
|
pr_debug("%s: unable to resolve type %X addresses.\n",
|
|
|
|
dev->name, ntohs(veth->h_vlan_encapsulated_proto));
|
2007-02-09 14:24:25 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
|
|
|
|
break;
|
2007-04-21 00:09:22 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
|
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
if (vlan_dev_info(skb->dev)->flags & VLAN_FLAG_REORDER_HDR) {
|
2008-07-08 22:36:57 +00:00
|
|
|
if (skb_cow(skb, skb_headroom(skb)) < 0)
|
|
|
|
skb = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (skb) {
|
|
|
|
/* Lifted from Gleb's VLAN code... */
|
|
|
|
memmove(skb->data - ETH_HLEN,
|
|
|
|
skb->data - VLAN_ETH_HLEN, 12);
|
2007-04-11 04:21:55 +00:00
|
|
|
skb->mac_header += VLAN_HLEN;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2008-01-21 08:28:03 +00:00
|
|
|
static inline void vlan_set_encap_proto(struct sk_buff *skb,
|
|
|
|
struct vlan_hdr *vhdr)
|
|
|
|
{
|
|
|
|
__be16 proto;
|
|
|
|
unsigned char *rawp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Was a VLAN packet, grab the encapsulated protocol, which the layer
|
|
|
|
* three protocols care about.
|
|
|
|
*/
|
|
|
|
|
|
|
|
proto = vhdr->h_vlan_encapsulated_proto;
|
|
|
|
if (ntohs(proto) >= 1536) {
|
|
|
|
skb->protocol = proto;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
rawp = skb->data;
|
|
|
|
if (*(unsigned short *)rawp == 0xFFFF)
|
|
|
|
/*
|
|
|
|
* This is a magic hack to spot IPX packets. Older Novell
|
|
|
|
* breaks the protocol design and runs IPX over 802.3 without
|
|
|
|
* an 802.2 LLC layer. We look for FFFF which isn't a used
|
|
|
|
* 802.2 SSAP/DSAP. This won't work for fault tolerant netware
|
|
|
|
* but does for the rest.
|
|
|
|
*/
|
|
|
|
skb->protocol = htons(ETH_P_802_3);
|
|
|
|
else
|
|
|
|
/*
|
|
|
|
* Real 802.2 LLC
|
|
|
|
*/
|
|
|
|
skb->protocol = htons(ETH_P_802_2);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2007-02-09 14:24:25 +00:00
|
|
|
* Determine the packet's protocol ID. The rule here is that we
|
2005-04-16 22:20:36 +00:00
|
|
|
* assume 802.3 if the type field is short enough to be a length.
|
|
|
|
* This is normal practice and works for any 'now in use' protocol.
|
|
|
|
*
|
|
|
|
* Also, at this point we assume that we ARE dealing exclusively with
|
|
|
|
* VLAN packets, or packets that should be made into VLAN packets based
|
|
|
|
* on a default VLAN ID.
|
|
|
|
*
|
|
|
|
* NOTE: Should be similar to ethernet/eth.c.
|
|
|
|
*
|
|
|
|
* SANITY NOTE: This method is called when a packet is moving up the stack
|
|
|
|
* towards userland. To get here, it would have already passed
|
|
|
|
* through the ethernet/eth.c eth_type_trans() method.
|
|
|
|
* SANITY NOTE 2: We are referencing to the VLAN_HDR frields, which MAY be
|
|
|
|
* stored UNALIGNED in the memory. RISC systems don't like
|
|
|
|
* such cases very much...
|
2008-01-21 08:26:41 +00:00
|
|
|
* SANITY NOTE 2a: According to Dave Miller & Alexey, it will always be
|
|
|
|
* aligned, so there doesn't need to be any of the unaligned
|
|
|
|
* stuff. It has been commented out now... --Ben
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
|
2008-01-21 08:26:41 +00:00
|
|
|
struct packet_type *ptype, struct net_device *orig_dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-08-25 06:36:29 +00:00
|
|
|
struct vlan_hdr *vhdr;
|
2009-11-17 04:53:09 +00:00
|
|
|
struct vlan_rx_stats *rx_stats;
|
2008-07-08 10:24:44 +00:00
|
|
|
u16 vlan_id;
|
|
|
|
u16 vlan_tci;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:26:41 +00:00
|
|
|
skb = skb_share_check(skb, GFP_ATOMIC);
|
|
|
|
if (skb == NULL)
|
2008-01-21 08:27:18 +00:00
|
|
|
goto err_free;
|
2007-08-25 06:36:29 +00:00
|
|
|
|
2008-01-21 08:27:18 +00:00
|
|
|
if (unlikely(!pskb_may_pull(skb, VLAN_HLEN)))
|
|
|
|
goto err_free;
|
2007-08-25 06:36:29 +00:00
|
|
|
|
2008-01-21 08:27:18 +00:00
|
|
|
vhdr = (struct vlan_hdr *)skb->data;
|
2008-07-08 10:24:44 +00:00
|
|
|
vlan_tci = ntohs(vhdr->h_vlan_TCI);
|
|
|
|
vlan_id = vlan_tci & VLAN_VID_MASK;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
rcu_read_lock();
|
2008-07-08 10:24:44 +00:00
|
|
|
skb->dev = __find_vlan_dev(dev, vlan_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!skb->dev) {
|
2008-01-21 08:26:41 +00:00
|
|
|
pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
|
2008-07-08 10:24:44 +00:00
|
|
|
__func__, vlan_id, dev->name);
|
2008-01-21 08:27:18 +00:00
|
|
|
goto err_unlock;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2010-01-25 03:52:24 +00:00
|
|
|
rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
|
2009-11-17 04:53:09 +00:00
|
|
|
smp_processor_id());
|
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;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-03-21 06:43:56 +00:00
|
|
|
skb_pull_rcsum(skb, VLAN_HLEN);
|
2005-12-15 00:23:16 +00:00
|
|
|
|
2008-07-08 10:24:44 +00:00
|
|
|
skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:24:30 +00:00
|
|
|
pr_debug("%s: priority: %u for TCI: %hu\n",
|
2008-07-08 10:24:44 +00:00
|
|
|
__func__, skb->priority, vlan_tci);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
switch (skb->pkt_type) {
|
|
|
|
case PACKET_BROADCAST: /* Yeah, stats collect these together.. */
|
2008-01-21 08:26:41 +00:00
|
|
|
/* stats->broadcast ++; // no such counter :-( */
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PACKET_MULTICAST:
|
2010-06-24 00:55:06 +00:00
|
|
|
rx_stats->rx_multicast++;
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
2007-02-09 14:24:25 +00:00
|
|
|
case PACKET_OTHERHOST:
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Our lower layer thinks this is not local, let's make sure.
|
2008-01-21 08:26:41 +00:00
|
|
|
* This allows the VLAN to have a different MAC than the
|
|
|
|
* underlying device, and still route correctly.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2008-01-21 08:26:41 +00:00
|
|
|
if (!compare_ether_addr(eth_hdr(skb)->h_dest,
|
|
|
|
skb->dev->dev_addr))
|
2005-04-16 22:20:36 +00:00
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2007-04-21 00:09:22 +00:00
|
|
|
}
|
2010-06-24 00:55:06 +00:00
|
|
|
u64_stats_update_end(&rx_stats->syncp);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:28:03 +00:00
|
|
|
vlan_set_encap_proto(skb, vhdr);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
skb = vlan_check_reorder_header(skb);
|
2008-01-21 08:27:18 +00:00
|
|
|
if (!skb) {
|
2009-11-17 04:53:09 +00:00
|
|
|
rx_stats->rx_errors++;
|
2008-01-21 08:27:18 +00:00
|
|
|
goto err_unlock;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-01-21 08:27:18 +00:00
|
|
|
|
|
|
|
netif_rx(skb);
|
2005-04-16 22:20:36 +00:00
|
|
|
rcu_read_unlock();
|
2008-01-21 08:27:18 +00:00
|
|
|
return NET_RX_SUCCESS;
|
|
|
|
|
|
|
|
err_unlock:
|
|
|
|
rcu_read_unlock();
|
|
|
|
err_free:
|
|
|
|
kfree_skb(skb);
|
|
|
|
return NET_RX_DROP;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-07-08 10:24:44 +00:00
|
|
|
static inline u16
|
2008-01-21 08:26:41 +00:00
|
|
|
vlan_dev_get_egress_qos_mask(struct net_device *dev, struct sk_buff *skb)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:41 +00:00
|
|
|
struct vlan_priority_tci_mapping *mp;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:26:41 +00:00
|
|
|
mp = vlan_dev_info(dev)->egress_priority_map[(skb->priority & 0xF)];
|
2005-04-16 22:20:36 +00:00
|
|
|
while (mp) {
|
|
|
|
if (mp->priority == skb->priority) {
|
2008-01-21 08:26:41 +00:00
|
|
|
return mp->vlan_qos; /* This should already be shifted
|
|
|
|
* to mask correctly with the
|
|
|
|
* VLAN's TCI */
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
mp = mp->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-02-09 14:24:25 +00:00
|
|
|
* Create the VLAN header for an arbitrary protocol layer
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* saddr=NULL means use device source address
|
|
|
|
* daddr=NULL means leave destination address (eg unresolved arp)
|
|
|
|
*
|
|
|
|
* This is called when the SKB is moving down the stack towards the
|
|
|
|
* physical devices.
|
|
|
|
*/
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
unsigned short type,
|
|
|
|
const void *daddr, const void *saddr,
|
|
|
|
unsigned int len)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct vlan_hdr *vhdr;
|
2008-07-15 05:51:19 +00:00
|
|
|
unsigned int vhdrlen = 0;
|
2008-07-08 10:24:44 +00:00
|
|
|
u16 vlan_tci = 0;
|
2008-07-15 05:51:19 +00:00
|
|
|
int rc;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-08 22:36:57 +00:00
|
|
|
if (WARN_ON(skb_headroom(skb) < dev->hard_header_len))
|
|
|
|
return -ENOSPC;
|
|
|
|
|
2008-07-15 05:51:19 +00:00
|
|
|
if (!(vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
|
|
|
|
|
2008-07-08 10:24:44 +00:00
|
|
|
vlan_tci = vlan_dev_info(dev)->vlan_id;
|
|
|
|
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
|
|
|
|
vhdr->h_vlan_TCI = htons(vlan_tci);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
2009-12-26 11:50:59 +00:00
|
|
|
* Set the protocol type. For a packet of type ETH_P_802_3/2 we
|
|
|
|
* put the length in here instead.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2009-12-26 11:50:59 +00:00
|
|
|
if (type != ETH_P_802_3 && type != ETH_P_802_2)
|
2005-04-16 22:20:36 +00:00
|
|
|
vhdr->h_vlan_encapsulated_proto = htons(type);
|
2008-01-21 08:26:41 +00:00
|
|
|
else
|
2005-04-16 22:20:36 +00:00
|
|
|
vhdr->h_vlan_encapsulated_proto = htons(len);
|
2007-04-13 23:12:47 +00:00
|
|
|
|
|
|
|
skb->protocol = htons(ETH_P_8021Q);
|
2008-07-15 05:51:19 +00:00
|
|
|
type = ETH_P_8021Q;
|
|
|
|
vhdrlen = VLAN_HLEN;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Before delegating work to the lower layer, enter our MAC-address */
|
|
|
|
if (saddr == NULL)
|
|
|
|
saddr = dev->dev_addr;
|
|
|
|
|
2008-07-15 05:51:19 +00:00
|
|
|
/* Now make the underlying real hard header */
|
2008-01-21 08:26:07 +00:00
|
|
|
dev = vlan_dev_info(dev)->real_dev;
|
2008-07-15 05:51:19 +00:00
|
|
|
rc = dev_hard_header(skb, dev, type, daddr, saddr, len + vhdrlen);
|
|
|
|
if (rc > 0)
|
|
|
|
rc += vhdrlen;
|
2005-04-16 22:20:36 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-08-31 19:50:41 +00:00
|
|
|
static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-09-03 09:19:58 +00:00
|
|
|
int i = skb_get_queue_mapping(skb);
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
2005-04-16 22:20:36 +00:00
|
|
|
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
|
2009-09-03 00:39:16 +00:00
|
|
|
unsigned int len;
|
|
|
|
int ret;
|
2008-02-24 04:09:11 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Handle non-VLAN frames if they are sent to us, for example by DHCP.
|
|
|
|
*
|
|
|
|
* NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING
|
|
|
|
* OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
|
|
|
|
*/
|
2007-11-29 11:16:41 +00:00
|
|
|
if (veth->h_vlan_proto != htons(ETH_P_8021Q) ||
|
2008-07-15 05:51:39 +00:00
|
|
|
vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR) {
|
|
|
|
unsigned int orig_headroom = skb_headroom(skb);
|
2008-07-08 10:24:44 +00:00
|
|
|
u16 vlan_tci;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:26:07 +00:00
|
|
|
vlan_dev_info(dev)->cnt_encap_on_xmit++;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-08 10:24:44 +00:00
|
|
|
vlan_tci = vlan_dev_info(dev)->vlan_id;
|
|
|
|
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
|
|
|
|
skb = __vlan_put_tag(skb, vlan_tci);
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!skb) {
|
2009-05-18 00:35:38 +00:00
|
|
|
txq->tx_dropped++;
|
2008-07-15 05:51:39 +00:00
|
|
|
return NETDEV_TX_OK;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-21 08:26:41 +00:00
|
|
|
if (orig_headroom < VLAN_HLEN)
|
2008-01-21 08:26:07 +00:00
|
|
|
vlan_dev_info(dev)->cnt_inc_headroom_on_tx++;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-30 12:23:03 +00:00
|
|
|
skb_set_dev(skb, vlan_dev_info(dev)->real_dev);
|
2009-09-03 00:39:16 +00:00
|
|
|
len = skb->len;
|
|
|
|
ret = dev_queue_xmit(skb);
|
|
|
|
|
2010-05-10 04:51:02 +00:00
|
|
|
if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
|
2009-09-03 00:39:16 +00:00
|
|
|
txq->tx_packets++;
|
|
|
|
txq->tx_bytes += len;
|
|
|
|
} else
|
|
|
|
txq->tx_dropped++;
|
|
|
|
|
2009-11-10 06:14:24 +00:00
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2009-08-31 19:50:41 +00:00
|
|
|
static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-09-03 09:19:58 +00:00
|
|
|
int i = skb_get_queue_mapping(skb);
|
|
|
|
struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
|
2008-07-08 10:24:44 +00:00
|
|
|
u16 vlan_tci;
|
2009-09-03 00:39:16 +00:00
|
|
|
unsigned int len;
|
|
|
|
int ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-08 10:24:44 +00:00
|
|
|
vlan_tci = vlan_dev_info(dev)->vlan_id;
|
|
|
|
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
|
|
|
|
skb = __vlan_hwaccel_put_tag(skb, vlan_tci);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-01-21 08:26:07 +00:00
|
|
|
skb->dev = vlan_dev_info(dev)->real_dev;
|
2009-09-03 00:39:16 +00:00
|
|
|
len = skb->len;
|
|
|
|
ret = dev_queue_xmit(skb);
|
|
|
|
|
2010-05-10 04:51:02 +00:00
|
|
|
if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
|
2009-09-03 00:39:16 +00:00
|
|
|
txq->tx_packets++;
|
|
|
|
txq->tx_bytes += len;
|
|
|
|
} else
|
|
|
|
txq->tx_dropped++;
|
|
|
|
|
2009-11-10 06:14:24 +00:00
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2010-03-23 14:41:45 +00:00
|
|
|
static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct net_device *rdev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = rdev->netdev_ops;
|
|
|
|
|
|
|
|
return ops->ndo_select_queue(rdev, skb);
|
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
/* TODO: gotta make sure the underlying layer can handle it,
|
|
|
|
* maybe an IFF_VLAN_CAPABLE flag for devices?
|
|
|
|
*/
|
2008-01-21 08:26:07 +00:00
|
|
|
if (vlan_dev_info(dev)->real_dev->mtu < new_mtu)
|
2005-04-16 22:20:36 +00:00
|
|
|
return -ERANGE;
|
|
|
|
|
|
|
|
dev->mtu = new_mtu;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-13 19:05:22 +00:00
|
|
|
void vlan_dev_set_ingress_priority(const struct net_device *dev,
|
2008-07-08 10:24:44 +00:00
|
|
|
u32 skb_prio, u16 vlan_prio)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2007-06-13 19:07:22 +00:00
|
|
|
|
|
|
|
if (vlan->ingress_priority_map[vlan_prio & 0x7] && !skb_prio)
|
|
|
|
vlan->nr_ingress_mappings--;
|
|
|
|
else if (!vlan->ingress_priority_map[vlan_prio & 0x7] && skb_prio)
|
|
|
|
vlan->nr_ingress_mappings++;
|
|
|
|
|
|
|
|
vlan->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-06-13 19:05:22 +00:00
|
|
|
int vlan_dev_set_egress_priority(const struct net_device *dev,
|
2008-07-08 10:24:44 +00:00
|
|
|
u32 skb_prio, u16 vlan_prio)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
struct vlan_priority_tci_mapping *mp = NULL;
|
|
|
|
struct vlan_priority_tci_mapping *np;
|
2009-10-27 01:40:35 +00:00
|
|
|
u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
|
2007-02-09 14:24:25 +00:00
|
|
|
|
2007-06-13 19:05:22 +00:00
|
|
|
/* See if a priority mapping exists.. */
|
2007-06-13 19:07:22 +00:00
|
|
|
mp = vlan->egress_priority_map[skb_prio & 0xF];
|
2007-06-13 19:05:22 +00:00
|
|
|
while (mp) {
|
|
|
|
if (mp->priority == skb_prio) {
|
2007-06-13 19:07:22 +00:00
|
|
|
if (mp->vlan_qos && !vlan_qos)
|
|
|
|
vlan->nr_egress_mappings--;
|
|
|
|
else if (!mp->vlan_qos && vlan_qos)
|
|
|
|
vlan->nr_egress_mappings++;
|
|
|
|
mp->vlan_qos = vlan_qos;
|
2007-06-13 19:05:22 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-06-13 19:05:22 +00:00
|
|
|
mp = mp->next;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-06-13 19:05:22 +00:00
|
|
|
|
|
|
|
/* Create a new mapping then. */
|
2007-06-13 19:07:22 +00:00
|
|
|
mp = vlan->egress_priority_map[skb_prio & 0xF];
|
2007-06-13 19:05:22 +00:00
|
|
|
np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
|
|
|
|
if (!np)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
np->next = mp;
|
|
|
|
np->priority = skb_prio;
|
2007-06-13 19:07:22 +00:00
|
|
|
np->vlan_qos = vlan_qos;
|
|
|
|
vlan->egress_priority_map[skb_prio & 0xF] = np;
|
|
|
|
if (vlan_qos)
|
|
|
|
vlan->nr_egress_mappings++;
|
2007-06-13 19:05:22 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-06-13 19:07:37 +00:00
|
|
|
/* Flags are defined in the vlan_flags enum in include/linux/if_vlan.h file. */
|
2008-07-06 04:26:27 +00:00
|
|
|
int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-07-06 04:26:27 +00:00
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
|
|
|
u32 old_flags = vlan->flags;
|
|
|
|
|
2009-11-25 07:54:54 +00:00
|
|
|
if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
|
|
|
|
VLAN_FLAG_LOOSE_BINDING))
|
2008-07-06 04:26:27 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
vlan->flags = (old_flags & ~mask) | (flags & mask);
|
2008-07-06 04:26:57 +00:00
|
|
|
|
|
|
|
if (netif_running(dev) && (vlan->flags ^ old_flags) & VLAN_FLAG_GVRP) {
|
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_join(dev);
|
|
|
|
else
|
|
|
|
vlan_gvrp_request_leave(dev);
|
|
|
|
}
|
2008-07-06 04:26:27 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-06-13 19:05:22 +00:00
|
|
|
void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
strncpy(result, vlan_dev_info(dev)->real_dev->name, 23);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_open(struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2007-07-12 02:45:24 +00:00
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
|
|
|
int err;
|
|
|
|
|
2009-11-25 07:54:54 +00:00
|
|
|
if (!(real_dev->flags & IFF_UP) &&
|
|
|
|
!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
|
2005-04-16 22:20:36 +00:00
|
|
|
return -ENETDOWN;
|
|
|
|
|
2007-07-12 02:45:24 +00:00
|
|
|
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) {
|
2010-04-01 21:22:09 +00:00
|
|
|
err = dev_uc_add(real_dev, dev->dev_addr);
|
2007-07-12 02:45:24 +00:00
|
|
|
if (err < 0)
|
2008-07-15 03:59:03 +00:00
|
|
|
goto out;
|
2007-07-12 02:45:24 +00:00
|
|
|
}
|
|
|
|
|
2008-07-15 03:59:03 +00:00
|
|
|
if (dev->flags & IFF_ALLMULTI) {
|
|
|
|
err = dev_set_allmulti(real_dev, 1);
|
|
|
|
if (err < 0)
|
|
|
|
goto del_unicast;
|
|
|
|
}
|
|
|
|
if (dev->flags & IFF_PROMISC) {
|
|
|
|
err = dev_set_promiscuity(real_dev, 1);
|
|
|
|
if (err < 0)
|
|
|
|
goto clear_allmulti;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(vlan->real_dev_addr, real_dev->dev_addr, ETH_ALEN);
|
2007-07-15 01:52:56 +00:00
|
|
|
|
2008-07-06 04:26:57 +00:00
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_join(dev);
|
|
|
|
|
2009-04-26 01:03:35 +00:00
|
|
|
netif_carrier_on(dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
2008-07-15 03:59:03 +00:00
|
|
|
|
|
|
|
clear_allmulti:
|
|
|
|
if (dev->flags & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, -1);
|
|
|
|
del_unicast:
|
|
|
|
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
|
2010-04-01 21:22:09 +00:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2008-07-15 03:59:03 +00:00
|
|
|
out:
|
2009-04-26 01:03:35 +00:00
|
|
|
netif_carrier_off(dev);
|
2008-07-15 03:59:03 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_stop(struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-07-06 04:26:57 +00:00
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
|
|
|
|
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_leave(dev);
|
2007-07-12 02:45:24 +00:00
|
|
|
|
2007-07-15 01:53:28 +00:00
|
|
|
dev_mc_unsync(real_dev, dev);
|
2010-04-01 21:22:09 +00:00
|
|
|
dev_uc_unsync(real_dev, dev);
|
2007-07-15 01:52:56 +00:00
|
|
|
if (dev->flags & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, -1);
|
|
|
|
if (dev->flags & IFF_PROMISC)
|
|
|
|
dev_set_promiscuity(real_dev, -1);
|
|
|
|
|
2007-07-12 02:45:24 +00:00
|
|
|
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
|
2010-04-01 21:22:09 +00:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2007-07-12 02:45:24 +00:00
|
|
|
|
2009-04-26 01:03:35 +00:00
|
|
|
netif_carrier_off(dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
|
2007-11-11 05:52:35 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
2007-11-11 05:52:35 +00:00
|
|
|
struct sockaddr *addr = p;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!is_valid_ether_addr(addr->sa_data))
|
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
|
|
if (!(dev->flags & IFF_UP))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) {
|
2010-04-01 21:22:09 +00:00
|
|
|
err = dev_uc_add(real_dev, addr->sa_data);
|
2007-11-11 05:52:35 +00:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
|
2010-04-01 21:22:09 +00:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2007-11-11 05:52:35 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
2008-11-20 05:53:47 +00:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct ifreq ifrr;
|
|
|
|
int err = -EOPNOTSUPP;
|
|
|
|
|
|
|
|
strncpy(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
|
|
|
|
ifrr.ifr_ifru = ifr->ifr_ifru;
|
|
|
|
|
2008-01-21 08:26:41 +00:00
|
|
|
switch (cmd) {
|
2005-04-16 22:20:36 +00:00
|
|
|
case SIOCGMIIPHY:
|
|
|
|
case SIOCGMIIREG:
|
|
|
|
case SIOCSMIIREG:
|
2008-11-20 05:53:47 +00:00
|
|
|
if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
|
|
|
|
err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-02-09 14:24:25 +00:00
|
|
|
if (!err)
|
2005-04-16 22:20:36 +00:00
|
|
|
ifr->ifr_ifru = ifrr.ifr_ifru;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-01-08 18:50:20 +00:00
|
|
|
static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (netif_device_present(real_dev) && ops->ndo_neigh_setup)
|
2009-03-05 07:46:25 +00:00
|
|
|
err = ops->ndo_neigh_setup(real_dev, pa);
|
2009-01-08 18:50:20 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-08-14 12:41:07 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
static int vlan_dev_fcoe_ddp_setup(struct net_device *dev, u16 xid,
|
|
|
|
struct scatterlist *sgl, unsigned int sgc)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_ddp_setup)
|
|
|
|
rc = ops->ndo_fcoe_ddp_setup(real_dev, xid, sgl, sgc);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vlan_dev_fcoe_ddp_done(struct net_device *dev, u16 xid)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int len = 0;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_ddp_done)
|
|
|
|
len = ops->ndo_fcoe_ddp_done(real_dev, xid);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
2009-08-31 12:31:55 +00:00
|
|
|
|
|
|
|
static int vlan_dev_fcoe_enable(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_enable)
|
|
|
|
rc = ops->ndo_fcoe_enable(real_dev);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vlan_dev_fcoe_disable(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_disable)
|
|
|
|
rc = ops->ndo_fcoe_disable(real_dev);
|
|
|
|
return rc;
|
|
|
|
}
|
2009-10-28 18:25:16 +00:00
|
|
|
|
|
|
|
static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
|
|
|
|
{
|
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_get_wwn)
|
|
|
|
rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
|
|
|
|
return rc;
|
|
|
|
}
|
2009-08-14 12:41:07 +00:00
|
|
|
#endif
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
|
2007-07-15 01:52:56 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
2007-07-15 01:52:56 +00:00
|
|
|
|
|
|
|
if (change & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
|
|
|
|
if (change & IFF_PROMISC)
|
|
|
|
dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
|
|
|
|
}
|
|
|
|
|
2008-02-01 00:53:23 +00:00
|
|
|
static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
dev_mc_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
|
2010-04-01 21:22:09 +00:00
|
|
|
dev_uc_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-01-21 08:22:11 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* vlan network devices have devices nesting below it, and are a special
|
|
|
|
* "super class" of normal network devices; split their locks off into a
|
|
|
|
* separate class since they always nest.
|
|
|
|
*/
|
|
|
|
static struct lock_class_key vlan_netdev_xmit_lock_key;
|
2008-07-22 21:16:42 +00:00
|
|
|
static struct lock_class_key vlan_netdev_addr_lock_key;
|
2008-01-21 08:22:11 +00:00
|
|
|
|
2008-07-17 07:34:19 +00:00
|
|
|
static void vlan_dev_set_lockdep_one(struct net_device *dev,
|
|
|
|
struct netdev_queue *txq,
|
|
|
|
void *_subclass)
|
2008-07-09 06:13:53 +00:00
|
|
|
{
|
|
|
|
lockdep_set_class_and_subclass(&txq->_xmit_lock,
|
2008-07-17 07:34:19 +00:00
|
|
|
&vlan_netdev_xmit_lock_key,
|
|
|
|
*(int *)_subclass);
|
2008-07-09 06:13:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
|
|
|
|
{
|
2008-07-22 21:16:42 +00:00
|
|
|
lockdep_set_class_and_subclass(&dev->addr_list_lock,
|
|
|
|
&vlan_netdev_addr_lock_key,
|
|
|
|
subclass);
|
2008-07-17 07:34:19 +00:00
|
|
|
netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);
|
2008-07-09 06:13:53 +00:00
|
|
|
}
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static const struct header_ops vlan_header_ops = {
|
|
|
|
.create = vlan_dev_hard_header,
|
|
|
|
.rebuild = vlan_dev_rebuild_header,
|
|
|
|
.parse = eth_header_parse,
|
|
|
|
};
|
|
|
|
|
2010-03-23 14:41:45 +00:00
|
|
|
static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops,
|
|
|
|
vlan_netdev_ops_sq, vlan_netdev_accel_ops_sq;
|
2008-12-26 00:45:19 +00:00
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
static int vlan_dev_init(struct net_device *dev)
|
|
|
|
{
|
2008-01-21 08:26:07 +00:00
|
|
|
struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
|
2008-01-21 08:22:11 +00:00
|
|
|
int subclass = 0;
|
|
|
|
|
2009-04-26 01:03:35 +00:00
|
|
|
netif_carrier_off(dev);
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
/* IFF_BROADCAST|IFF_MULTICAST; ??? */
|
2010-05-12 21:31:06 +00:00
|
|
|
dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |
|
|
|
|
IFF_MASTER | IFF_SLAVE);
|
2008-01-21 08:22:11 +00:00
|
|
|
dev->iflink = real_dev->ifindex;
|
|
|
|
dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
|
|
|
|
(1<<__LINK_STATE_DORMANT))) |
|
|
|
|
(1<<__LINK_STATE_PRESENT);
|
|
|
|
|
2008-05-23 07:22:04 +00:00
|
|
|
dev->features |= real_dev->features & real_dev->vlan_features;
|
2008-09-12 03:17:05 +00:00
|
|
|
dev->gso_max_size = real_dev->gso_max_size;
|
2008-05-20 21:54:50 +00:00
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
/* ipv6 shared card related stuff */
|
|
|
|
dev->dev_id = real_dev->dev_id;
|
|
|
|
|
|
|
|
if (is_zero_ether_addr(dev->dev_addr))
|
|
|
|
memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len);
|
|
|
|
if (is_zero_ether_addr(dev->broadcast))
|
|
|
|
memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
|
|
|
|
|
2009-08-14 12:41:07 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;
|
|
|
|
#endif
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
if (real_dev->features & NETIF_F_HW_VLAN_TX) {
|
|
|
|
dev->header_ops = real_dev->header_ops;
|
|
|
|
dev->hard_header_len = real_dev->hard_header_len;
|
2010-03-23 14:41:45 +00:00
|
|
|
if (real_dev->netdev_ops->ndo_select_queue)
|
|
|
|
dev->netdev_ops = &vlan_netdev_accel_ops_sq;
|
|
|
|
else
|
|
|
|
dev->netdev_ops = &vlan_netdev_accel_ops;
|
2008-01-21 08:22:11 +00:00
|
|
|
} else {
|
|
|
|
dev->header_ops = &vlan_header_ops;
|
|
|
|
dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
|
2010-03-23 14:41:45 +00:00
|
|
|
if (real_dev->netdev_ops->ndo_select_queue)
|
|
|
|
dev->netdev_ops = &vlan_netdev_ops_sq;
|
|
|
|
else
|
|
|
|
dev->netdev_ops = &vlan_netdev_ops;
|
2008-01-21 08:22:11 +00:00
|
|
|
}
|
|
|
|
|
2008-07-08 10:22:16 +00:00
|
|
|
if (is_vlan_dev(real_dev))
|
2008-01-21 08:22:11 +00:00
|
|
|
subclass = 1;
|
|
|
|
|
2008-07-09 06:13:53 +00:00
|
|
|
vlan_dev_set_lockdep_class(dev, subclass);
|
2009-11-17 04:53:09 +00:00
|
|
|
|
|
|
|
vlan_dev_info(dev)->vlan_rx_stats = alloc_percpu(struct vlan_rx_stats);
|
|
|
|
if (!vlan_dev_info(dev)->vlan_rx_stats)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-04-04 19:45:12 +00:00
|
|
|
static void vlan_dev_uninit(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct vlan_priority_tci_mapping *pm;
|
|
|
|
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
|
|
|
int i;
|
|
|
|
|
2009-11-17 04:53:09 +00:00
|
|
|
free_percpu(vlan->vlan_rx_stats);
|
|
|
|
vlan->vlan_rx_stats = NULL;
|
2008-04-04 19:45:12 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
|
|
|
|
while ((pm = vlan->egress_priority_map[i]) != NULL) {
|
|
|
|
vlan->egress_priority_map[i] = pm->next;
|
|
|
|
kfree(pm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-29 05:12:36 +00:00
|
|
|
static int vlan_ethtool_get_settings(struct net_device *dev,
|
|
|
|
struct ethtool_cmd *cmd)
|
|
|
|
{
|
|
|
|
const struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2009-04-20 04:49:28 +00:00
|
|
|
return dev_ethtool_get_settings(vlan->real_dev, cmd);
|
2008-10-29 05:12:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_ethtool_get_drvinfo(struct net_device *dev,
|
|
|
|
struct ethtool_drvinfo *info)
|
|
|
|
{
|
|
|
|
strcpy(info->driver, vlan_fullname);
|
|
|
|
strcpy(info->version, vlan_version);
|
|
|
|
strcpy(info->fw_version, "N/A");
|
|
|
|
}
|
|
|
|
|
2008-07-08 10:22:42 +00:00
|
|
|
static u32 vlan_ethtool_get_rx_csum(struct net_device *dev)
|
|
|
|
{
|
|
|
|
const struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2009-04-20 04:49:28 +00:00
|
|
|
return dev_ethtool_get_rx_csum(vlan->real_dev);
|
2008-07-08 10:22:42 +00:00
|
|
|
}
|
|
|
|
|
2008-07-15 05:51:01 +00:00
|
|
|
static u32 vlan_ethtool_get_flags(struct net_device *dev)
|
|
|
|
{
|
|
|
|
const struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
2009-04-20 04:49:28 +00:00
|
|
|
return dev_ethtool_get_flags(vlan->real_dev);
|
2008-07-15 05:51:01 +00:00
|
|
|
}
|
|
|
|
|
2010-07-07 21:58:56 +00:00
|
|
|
static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
2009-11-17 04:53:09 +00:00
|
|
|
{
|
2010-07-07 21:58:56 +00:00
|
|
|
dev_txq_stats_fold(dev, (struct net_device_stats *)stats);
|
2009-11-17 04:53:09 +00:00
|
|
|
|
|
|
|
if (vlan_dev_info(dev)->vlan_rx_stats) {
|
2010-06-24 00:55:06 +00:00
|
|
|
struct vlan_rx_stats *p, accum = {0};
|
2009-11-17 04:53:09 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
2010-06-24 00:55:06 +00:00
|
|
|
u64 rxpackets, rxbytes, rxmulticast;
|
|
|
|
unsigned int start;
|
|
|
|
|
2009-11-17 04:53:09 +00:00
|
|
|
p = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats, i);
|
2010-06-24 00:55:06 +00:00
|
|
|
do {
|
|
|
|
start = u64_stats_fetch_begin_bh(&p->syncp);
|
|
|
|
rxpackets = p->rx_packets;
|
|
|
|
rxbytes = p->rx_bytes;
|
|
|
|
rxmulticast = p->rx_multicast;
|
|
|
|
} while (u64_stats_fetch_retry_bh(&p->syncp, start));
|
|
|
|
accum.rx_packets += rxpackets;
|
|
|
|
accum.rx_bytes += rxbytes;
|
|
|
|
accum.rx_multicast += rxmulticast;
|
|
|
|
/* rx_errors is an ulong, not protected by syncp */
|
|
|
|
accum.rx_errors += p->rx_errors;
|
2009-11-17 04:53:09 +00:00
|
|
|
}
|
2010-06-24 00:55:06 +00:00
|
|
|
stats->rx_packets = accum.rx_packets;
|
|
|
|
stats->rx_bytes = accum.rx_bytes;
|
|
|
|
stats->rx_errors = accum.rx_errors;
|
|
|
|
stats->multicast = accum.rx_multicast;
|
2009-11-17 04:53:09 +00:00
|
|
|
}
|
|
|
|
return stats;
|
|
|
|
}
|
|
|
|
|
2008-07-08 10:22:42 +00:00
|
|
|
static const struct ethtool_ops vlan_ethtool_ops = {
|
2008-10-29 05:12:36 +00:00
|
|
|
.get_settings = vlan_ethtool_get_settings,
|
|
|
|
.get_drvinfo = vlan_ethtool_get_drvinfo,
|
2008-07-08 10:22:42 +00:00
|
|
|
.get_link = ethtool_op_get_link,
|
|
|
|
.get_rx_csum = vlan_ethtool_get_rx_csum,
|
2008-07-15 05:51:01 +00:00
|
|
|
.get_flags = vlan_ethtool_get_flags,
|
2008-07-08 10:22:42 +00:00
|
|
|
};
|
|
|
|
|
2008-11-20 05:53:47 +00:00
|
|
|
static const struct net_device_ops vlan_netdev_ops = {
|
|
|
|
.ndo_change_mtu = vlan_dev_change_mtu,
|
|
|
|
.ndo_init = vlan_dev_init,
|
|
|
|
.ndo_uninit = vlan_dev_uninit,
|
|
|
|
.ndo_open = vlan_dev_open,
|
|
|
|
.ndo_stop = vlan_dev_stop,
|
2008-12-26 00:45:19 +00:00
|
|
|
.ndo_start_xmit = vlan_dev_hard_start_xmit,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = vlan_dev_set_mac_address,
|
|
|
|
.ndo_set_rx_mode = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_set_multicast_list = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_change_rx_flags = vlan_dev_change_rx_flags,
|
|
|
|
.ndo_do_ioctl = vlan_dev_ioctl,
|
2009-01-08 18:50:20 +00:00
|
|
|
.ndo_neigh_setup = vlan_dev_neigh_setup,
|
2010-06-24 00:55:06 +00:00
|
|
|
.ndo_get_stats64 = vlan_dev_get_stats64,
|
2009-08-14 12:41:07 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
.ndo_fcoe_ddp_setup = vlan_dev_fcoe_ddp_setup,
|
|
|
|
.ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done,
|
2009-08-31 12:31:55 +00:00
|
|
|
.ndo_fcoe_enable = vlan_dev_fcoe_enable,
|
|
|
|
.ndo_fcoe_disable = vlan_dev_fcoe_disable,
|
2009-10-28 18:25:16 +00:00
|
|
|
.ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,
|
2009-08-14 12:41:07 +00:00
|
|
|
#endif
|
2008-12-26 00:45:19 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct net_device_ops vlan_netdev_accel_ops = {
|
|
|
|
.ndo_change_mtu = vlan_dev_change_mtu,
|
|
|
|
.ndo_init = vlan_dev_init,
|
|
|
|
.ndo_uninit = vlan_dev_uninit,
|
|
|
|
.ndo_open = vlan_dev_open,
|
|
|
|
.ndo_stop = vlan_dev_stop,
|
2010-03-23 14:41:45 +00:00
|
|
|
.ndo_start_xmit = vlan_dev_hwaccel_hard_start_xmit,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = vlan_dev_set_mac_address,
|
|
|
|
.ndo_set_rx_mode = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_set_multicast_list = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_change_rx_flags = vlan_dev_change_rx_flags,
|
|
|
|
.ndo_do_ioctl = vlan_dev_ioctl,
|
|
|
|
.ndo_neigh_setup = vlan_dev_neigh_setup,
|
2010-06-24 00:55:06 +00:00
|
|
|
.ndo_get_stats64 = vlan_dev_get_stats64,
|
2010-03-23 14:41:45 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
.ndo_fcoe_ddp_setup = vlan_dev_fcoe_ddp_setup,
|
|
|
|
.ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done,
|
|
|
|
.ndo_fcoe_enable = vlan_dev_fcoe_enable,
|
|
|
|
.ndo_fcoe_disable = vlan_dev_fcoe_disable,
|
|
|
|
.ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct net_device_ops vlan_netdev_ops_sq = {
|
|
|
|
.ndo_select_queue = vlan_dev_select_queue,
|
|
|
|
.ndo_change_mtu = vlan_dev_change_mtu,
|
|
|
|
.ndo_init = vlan_dev_init,
|
|
|
|
.ndo_uninit = vlan_dev_uninit,
|
|
|
|
.ndo_open = vlan_dev_open,
|
|
|
|
.ndo_stop = vlan_dev_stop,
|
|
|
|
.ndo_start_xmit = vlan_dev_hard_start_xmit,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = vlan_dev_set_mac_address,
|
|
|
|
.ndo_set_rx_mode = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_set_multicast_list = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_change_rx_flags = vlan_dev_change_rx_flags,
|
|
|
|
.ndo_do_ioctl = vlan_dev_ioctl,
|
|
|
|
.ndo_neigh_setup = vlan_dev_neigh_setup,
|
2010-06-24 00:55:06 +00:00
|
|
|
.ndo_get_stats64 = vlan_dev_get_stats64,
|
2010-03-23 14:41:45 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
.ndo_fcoe_ddp_setup = vlan_dev_fcoe_ddp_setup,
|
|
|
|
.ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done,
|
|
|
|
.ndo_fcoe_enable = vlan_dev_fcoe_enable,
|
|
|
|
.ndo_fcoe_disable = vlan_dev_fcoe_disable,
|
|
|
|
.ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct net_device_ops vlan_netdev_accel_ops_sq = {
|
|
|
|
.ndo_select_queue = vlan_dev_select_queue,
|
|
|
|
.ndo_change_mtu = vlan_dev_change_mtu,
|
|
|
|
.ndo_init = vlan_dev_init,
|
|
|
|
.ndo_uninit = vlan_dev_uninit,
|
|
|
|
.ndo_open = vlan_dev_open,
|
|
|
|
.ndo_stop = vlan_dev_stop,
|
2008-12-26 00:45:19 +00:00
|
|
|
.ndo_start_xmit = vlan_dev_hwaccel_hard_start_xmit,
|
2008-11-20 05:53:47 +00:00
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = vlan_dev_set_mac_address,
|
|
|
|
.ndo_set_rx_mode = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_set_multicast_list = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_change_rx_flags = vlan_dev_change_rx_flags,
|
|
|
|
.ndo_do_ioctl = vlan_dev_ioctl,
|
2009-01-08 18:50:20 +00:00
|
|
|
.ndo_neigh_setup = vlan_dev_neigh_setup,
|
2010-06-24 00:55:06 +00:00
|
|
|
.ndo_get_stats64 = vlan_dev_get_stats64,
|
2009-08-14 12:41:07 +00:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
.ndo_fcoe_ddp_setup = vlan_dev_fcoe_ddp_setup,
|
|
|
|
.ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done,
|
2009-08-31 12:31:55 +00:00
|
|
|
.ndo_fcoe_enable = vlan_dev_fcoe_enable,
|
|
|
|
.ndo_fcoe_disable = vlan_dev_fcoe_disable,
|
2009-10-28 18:25:16 +00:00
|
|
|
.ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,
|
2009-08-14 12:41:07 +00:00
|
|
|
#endif
|
2008-11-20 05:53:47 +00:00
|
|
|
};
|
|
|
|
|
2008-01-21 08:22:11 +00:00
|
|
|
void vlan_setup(struct net_device *dev)
|
|
|
|
{
|
|
|
|
ether_setup(dev);
|
|
|
|
|
|
|
|
dev->priv_flags |= IFF_802_1Q_VLAN;
|
net: release dst entry in dev_hard_start_xmit()
One point of contention in high network loads is the dst_release() performed
when a transmited skb is freed. This is because NIC tx completion calls
dev_kree_skb() long after original call to dev_queue_xmit(skb).
CPU cache is cold and the atomic op in dst_release() stalls. On SMP, this is
quite visible if one CPU is 100% handling softirqs for a network device,
since dst_clone() is done by other cpus, involving cache line ping pongs.
It seems right place to release dst is in dev_hard_start_xmit(), for most
devices but ones that are virtual, and some exceptions.
David Miller suggested to define a new device flag, set in alloc_netdev_mq()
(so that most devices set it at init time), and carefuly unset in devices
which dont want a NULL skb->dst in their ndo_start_xmit().
List of devices that must clear this flag is :
- loopback device, because it calls netif_rx() and quoting Patrick :
"ip_route_input() doesn't accept loopback addresses, so loopback packets
already need to have a dst_entry attached."
- appletalk/ipddp.c : needs skb->dst in its xmit function
- And all devices that call again dev_queue_xmit() from their xmit function
(as some classifiers need skb->dst) : bonding, vlan, macvlan, eql, ifb, hdlc_fr
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-05-19 05:19:19 +00:00
|
|
|
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
|
2008-01-21 08:22:11 +00:00
|
|
|
dev->tx_queue_len = 0;
|
|
|
|
|
2008-11-20 05:53:47 +00:00
|
|
|
dev->netdev_ops = &vlan_netdev_ops;
|
2008-01-21 08:22:11 +00:00
|
|
|
dev->destructor = free_netdev;
|
2008-07-08 10:22:42 +00:00
|
|
|
dev->ethtool_ops = &vlan_ethtool_ops;
|
2008-01-21 08:22:11 +00:00
|
|
|
|
|
|
|
memset(dev->broadcast, 0, ETH_ALEN);
|
|
|
|
}
|