via-velocity: use standard VLAN interface (resend)

The via-velocity is using a non-standard VLAN interface configured
via module parameters (yuck).

Replace with the standard acceleration interface.
It solves a number of problems with being able to handle multiple
vlans, and dynamically reconfigure.

This is compile tested only, don't have this board.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index b9e114d36c0f..af17161286ae 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -1701,7 +1701,7 @@ struct velocity_opt {
         int numrx;                      /* Number of RX descriptors */
         int numtx;                      /* Number of TX descriptors */
         enum speed_opt spd_dpx;         /* Media link mode */
-        int vid;                        /* vlan id */
+
         int DMA_length;                 /* DMA length */
         int rx_thresh;                  /* RX_THRESH */
         int flow_cntl;
@@ -1727,6 +1727,7 @@ struct velocity_info {
         dma_addr_t tx_bufs_dma;
         u8 *tx_bufs;
 
+        struct vlan_group    *vlgrp;
         u8 ip_addr[4];
         enum chip_type chip_id;