Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus', 'x86-kexec-for...

[cascardo/linux.git] / drivers / net / benet / be.h

diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 9aa1534..c85768c 100644 (file)
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -199,6 +199,7 @@ struct be_rx_stats {
        u32 rx_polls;   /* number of times NAPI called poll function */
        u32 rx_events;  /* number of ucast rx completion events  */
        u32 rx_compl;   /* number of rx completion entries processed */
+       ulong rx_dropped; /* number of skb allocation errors */
        ulong rx_jiffies;
        u64 rx_bytes;
        u64 rx_bytes_prev;
@@ -332,7 +333,6 @@ struct be_adapter {
        u8 eq_next_idx;
        struct be_drv_stats drv_stats;
 
-       struct vlan_group *vlan_grp;
        u16 vlans_added;
        u16 max_vlans;  /* Number of vlans supported */
        u8 vlan_tag[VLAN_N_VID];