summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/usb2/ethernet/if_aue2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_auereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_axe2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_axereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_cdce2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_cdcereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_cue2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_cuereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_kue2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_kuereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_rue2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_ruereg.h3
-rw-r--r--sys/dev/usb2/ethernet/if_udav2.c1
-rw-r--r--sys/dev/usb2/ethernet/if_udavreg.h3
-rw-r--r--sys/dev/usb2/wlan/if_rum2.c1
-rw-r--r--sys/dev/usb2/wlan/if_rumvar.h3
-rw-r--r--sys/dev/usb2/wlan/if_ural2.c1
-rw-r--r--sys/dev/usb2/wlan/if_uralvar.h3
-rw-r--r--sys/dev/usb2/wlan/if_zyd2.c1
-rw-r--r--sys/dev/usb2/wlan/if_zydreg.h3
20 files changed, 10 insertions, 30 deletions
diff --git a/sys/dev/usb2/ethernet/if_aue2.c b/sys/dev/usb2/ethernet/if_aue2.c
index 0717e00..e923615 100644
--- a/sys/dev/usb2/ethernet/if_aue2.c
+++ b/sys/dev/usb2/ethernet/if_aue2.c
@@ -834,7 +834,6 @@ aue_cfg_first_time_setup(struct aue_softc *sc,
sc->sc_name);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "aue", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_auereg.h b/sys/dev/usb2/ethernet/if_auereg.h
index 819082d..7d41927 100644
--- a/sys/dev/usb2/ethernet/if_auereg.h
+++ b/sys/dev/usb2/ethernet/if_auereg.h
@@ -205,14 +205,13 @@ struct aue_rxpkt {
} __packed;
struct aue_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
struct aue_rxpkt sc_rxpkt;
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[AUE_N_TRANSFER];
device_t sc_miibus;
diff --git a/sys/dev/usb2/ethernet/if_axe2.c b/sys/dev/usb2/ethernet/if_axe2.c
index bec2243..d152dc2 100644
--- a/sys/dev/usb2/ethernet/if_axe2.c
+++ b/sys/dev/usb2/ethernet/if_axe2.c
@@ -843,7 +843,6 @@ axe_cfg_first_time_setup(struct axe_softc *sc,
sc->sc_name);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "axe", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_axereg.h b/sys/dev/usb2/ethernet/if_axereg.h
index bfbeb7b..ac3a3d0 100644
--- a/sys/dev/usb2/ethernet/if_axereg.h
+++ b/sys/dev/usb2/ethernet/if_axereg.h
@@ -181,13 +181,12 @@ enum {
};
struct axe_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[AXE_N_TRANSFER];
device_t sc_miibus;
diff --git a/sys/dev/usb2/ethernet/if_cdce2.c b/sys/dev/usb2/ethernet/if_cdce2.c
index d833287..6b56c7e 100644
--- a/sys/dev/usb2/ethernet/if_cdce2.c
+++ b/sys/dev/usb2/ethernet/if_cdce2.c
@@ -444,7 +444,6 @@ alloc_transfers:
device_printf(dev, "cannot if_alloc()\n");
goto detach;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "cdce", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_cdcereg.h b/sys/dev/usb2/ethernet/if_cdcereg.h
index e7548f3..277b7d0 100644
--- a/sys/dev/usb2/ethernet/if_cdcereg.h
+++ b/sys/dev/usb2/ethernet/if_cdcereg.h
@@ -61,7 +61,7 @@ enum {
};
struct cdce_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
union cdce_eth_tx sc_tx;
union cdce_eth_rx sc_rx;
@@ -70,7 +70,6 @@ struct cdce_softc {
struct cdce_mq sc_rx_mq;
struct cdce_mq sc_tx_mq;
- struct ifnet *sc_ifp;
struct usb2_xfer *sc_xfer[CDCE_N_TRANSFER];
struct usb2_device *sc_udev;
device_t sc_dev;
diff --git a/sys/dev/usb2/ethernet/if_cue2.c b/sys/dev/usb2/ethernet/if_cue2.c
index f9af804..fc1adfb 100644
--- a/sys/dev/usb2/ethernet/if_cue2.c
+++ b/sys/dev/usb2/ethernet/if_cue2.c
@@ -468,7 +468,6 @@ cue_cfg_first_time_setup(struct cue_softc *sc,
sc->sc_unit);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "cue", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_cuereg.h b/sys/dev/usb2/ethernet/if_cuereg.h
index 6b3d8d1..d277a41 100644
--- a/sys/dev/usb2/ethernet/if_cuereg.h
+++ b/sys/dev/usb2/ethernet/if_cuereg.h
@@ -122,13 +122,12 @@ enum {
};
struct cue_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
- struct ifnet *sc_ifp;
device_t sc_dev;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[CUE_N_TRANSFER];
diff --git a/sys/dev/usb2/ethernet/if_kue2.c b/sys/dev/usb2/ethernet/if_kue2.c
index ccc5add..b579b1d 100644
--- a/sys/dev/usb2/ethernet/if_kue2.c
+++ b/sys/dev/usb2/ethernet/if_kue2.c
@@ -536,7 +536,6 @@ kue_cfg_first_time_setup(struct kue_softc *sc,
sc->sc_unit);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "kue", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_kuereg.h b/sys/dev/usb2/ethernet/if_kuereg.h
index 9d622a3..6c0a24d 100644
--- a/sys/dev/usb2/ethernet/if_kuereg.h
+++ b/sys/dev/usb2/ethernet/if_kuereg.h
@@ -125,14 +125,13 @@ enum {
};
struct kue_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
struct kue_ether_desc sc_desc;
- struct ifnet *sc_ifp;
device_t sc_dev;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[KUE_N_TRANSFER];
diff --git a/sys/dev/usb2/ethernet/if_rue2.c b/sys/dev/usb2/ethernet/if_rue2.c
index f94ffb3..fe34d1f 100644
--- a/sys/dev/usb2/ethernet/if_rue2.c
+++ b/sys/dev/usb2/ethernet/if_rue2.c
@@ -713,7 +713,6 @@ rue_cfg_first_time_setup(struct rue_softc *sc,
sc->sc_name);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "rue", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_ruereg.h b/sys/dev/usb2/ethernet/if_ruereg.h
index c088506..6e5a885 100644
--- a/sys/dev/usb2/ethernet/if_ruereg.h
+++ b/sys/dev/usb2/ethernet/if_ruereg.h
@@ -174,13 +174,12 @@ enum {
};
struct rue_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[RUE_N_TRANSFER];
device_t sc_miibus;
diff --git a/sys/dev/usb2/ethernet/if_udav2.c b/sys/dev/usb2/ethernet/if_udav2.c
index befdf8f..99ee63c 100644
--- a/sys/dev/usb2/ethernet/if_udav2.c
+++ b/sys/dev/usb2/ethernet/if_udav2.c
@@ -344,7 +344,6 @@ udav_cfg_first_time_setup(struct udav_softc *sc,
sc->sc_name);
goto done;
}
- sc->sc_evilhack = ifp;
ifp->if_softc = sc;
if_initname(ifp, "udav", sc->sc_unit);
diff --git a/sys/dev/usb2/ethernet/if_udavreg.h b/sys/dev/usb2/ethernet/if_udavreg.h
index 48f8706..32a3d08 100644
--- a/sys/dev/usb2/ethernet/if_udavreg.h
+++ b/sys/dev/usb2/ethernet/if_udavreg.h
@@ -145,13 +145,12 @@ enum {
};
struct udav_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct usb2_config_td sc_config_td;
struct usb2_callout sc_watchdog;
struct mtx sc_mtx;
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[UDAV_N_TRANSFER];
device_t sc_miibus;
diff --git a/sys/dev/usb2/wlan/if_rum2.c b/sys/dev/usb2/wlan/if_rum2.c
index 991d328..b11d614 100644
--- a/sys/dev/usb2/wlan/if_rum2.c
+++ b/sys/dev/usb2/wlan/if_rum2.c
@@ -789,7 +789,6 @@ rum_cfg_first_time_setup(struct rum_softc *sc,
DPRINTFN(0, "could not if_alloc()!\n");
goto done;
}
- sc->sc_evilhack = ifp;
sc->sc_ifp = ifp;
ic = ifp->if_l2com;
diff --git a/sys/dev/usb2/wlan/if_rumvar.h b/sys/dev/usb2/wlan/if_rumvar.h
index ffa19f1..29ee0a5 100644
--- a/sys/dev/usb2/wlan/if_rumvar.h
+++ b/sys/dev/usb2/wlan/if_rumvar.h
@@ -120,7 +120,7 @@ enum {
};
struct rum_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct rum_ifq sc_tx_queue;
struct usb2_config_td sc_config_td;
@@ -133,7 +133,6 @@ struct rum_softc {
struct rum_tx_radiotap_header sc_txtap;
struct usb2_xfer *sc_xfer[RUM_N_TRANSFER];
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
const struct ieee80211_rate_table *sc_rates;
diff --git a/sys/dev/usb2/wlan/if_ural2.c b/sys/dev/usb2/wlan/if_ural2.c
index 9ac3521..0cb7bdd 100644
--- a/sys/dev/usb2/wlan/if_ural2.c
+++ b/sys/dev/usb2/wlan/if_ural2.c
@@ -800,7 +800,6 @@ ural_cfg_first_time_setup(struct ural_softc *sc,
DPRINTFN(0, "could not if_alloc()!\n");
goto done;
}
- sc->sc_evilhack = ifp;
sc->sc_ifp = ifp;
ic = ifp->if_l2com;
diff --git a/sys/dev/usb2/wlan/if_uralvar.h b/sys/dev/usb2/wlan/if_uralvar.h
index aa107ca..bab8965 100644
--- a/sys/dev/usb2/wlan/if_uralvar.h
+++ b/sys/dev/usb2/wlan/if_uralvar.h
@@ -120,7 +120,7 @@ enum {
};
struct ural_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct ural_ifq sc_tx_queue;
struct usb2_config_td sc_config_td;
@@ -133,7 +133,6 @@ struct ural_softc {
struct ural_tx_radiotap_header sc_txtap;
struct usb2_xfer *sc_xfer[URAL_N_TRANSFER];
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
const struct ieee80211_rate_table *sc_rates;
diff --git a/sys/dev/usb2/wlan/if_zyd2.c b/sys/dev/usb2/wlan/if_zyd2.c
index f18bee8..281035d 100644
--- a/sys/dev/usb2/wlan/if_zyd2.c
+++ b/sys/dev/usb2/wlan/if_zyd2.c
@@ -2078,7 +2078,6 @@ zyd_cfg_first_time_setup(struct zyd_softc *sc,
sc->sc_name);
goto done;
}
- sc->sc_evilhack = ifp;
sc->sc_ifp = ifp;
ic = ifp->if_l2com;
diff --git a/sys/dev/usb2/wlan/if_zydreg.h b/sys/dev/usb2/wlan/if_zydreg.h
index 635440f..2c7d90c 100644
--- a/sys/dev/usb2/wlan/if_zydreg.h
+++ b/sys/dev/usb2/wlan/if_zydreg.h
@@ -1285,7 +1285,7 @@ enum {
};
struct zyd_softc {
- void *sc_evilhack; /* XXX this pointer must be first */
+ struct ifnet *sc_ifp;
struct zyd_rf sc_rf;
struct usb2_callout sc_watchdog;
@@ -1299,7 +1299,6 @@ struct zyd_softc {
struct zyd_ifq sc_tx_queue;
struct cv sc_intr_cv;
- struct ifnet *sc_ifp;
struct usb2_device *sc_udev;
struct usb2_xfer *sc_xfer[ZYD_N_TRANSFER];
const struct ieee80211_rate_table *sc_rates;
OpenPOWER on IntegriCloud