Sweep additional floors of strcpy in .get_drvinfo routines

[jme.git] / jme.h

diff --git a/jme.h b/jme.h
index 1481a62a1f363c1cef2aca41a18e651407848c60..02ea27c1dcb5a464f06d9b38d98259f6f080fd4c 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -102,7 +102,6 @@ enum jme_spi_op_bits {
 };
 
 #define HALF_US 500    /* 500 ns */
-#define JMESPIIOCTL    SIOCDEVPRIVATE
 
 #define PCI_PRIV_PE1           0xE4
 
@@ -451,7 +450,6 @@ struct jme_adapter {
        u32                     msg_enable;
        struct ethtool_cmd      old_ecmd;
        unsigned int            old_mtu;
-       struct vlan_group       *vlgrp;
        struct dynpcc_info      dpi;
        atomic_t                intr_sem;
        atomic_t                link_changing;
@@ -459,9 +457,6 @@ struct jme_adapter {
        atomic_t                rx_cleaning;
        atomic_t                rx_empty;
        int                     (*jme_rx)(struct sk_buff *skb);
-       int                     (*jme_vlan_rx)(struct sk_buff *skb,
-                                         struct vlan_group *grp,
-                                         unsigned short vlan_tag);
        DECLARE_NAPI_STRUCT
        DECLARE_NET_DEVICE_STATS
 };