Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[uclinux-h8/linux.git] / drivers / net / ethernet / broadcom / bcmsysport.h

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index a7a2308..0b192fe 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -12,6 +12,7 @@
 #define __BCM_SYSPORT_H
 
 #include <linux/bitmap.h>
+#include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/net_dim.h>
 
@@ -778,6 +779,7 @@ struct bcm_sysport_priv {
        unsigned int            crc_fwd:1;
        u16                     rev;
        u32                     wolopts;
+       u8                      sopass[SOPASS_MAX];
        unsigned int            wol_irq_disabled:1;
 
        /* MIB related fields */
@@ -786,6 +788,7 @@ struct bcm_sysport_priv {
        /* Ethtool */
        u32                     msg_enable;
        DECLARE_BITMAP(filters, RXCHK_BRCM_TAG_MAX);
+       u32                     filters_loc[RXCHK_BRCM_TAG_MAX];
 
        struct bcm_sysport_stats64      stats64;
 
@@ -795,7 +798,6 @@ struct bcm_sysport_priv {
        /* map information between switch port queues and local queues */
        struct notifier_block   dsa_notifier;
        unsigned int            per_port_num_tx_queues;
-       unsigned long           queue_bitmap;
        struct bcm_sysport_tx_ring *ring_map[DSA_MAX_PORTS * 8];
 
 };