svn commit: r305791 - head/sys/dev/hyperv/netvsc
Sepherosa Ziehau
sephe at FreeBSD.org
Wed Sep 14 08:00:32 UTC 2016
Author: sephe
Date: Wed Sep 14 08:00:30 2016
New Revision: 305791
URL: https://svnweb.freebsd.org/changeset/base/305791
Log:
hyperv/hn: Deprecate hn_softc_t
MFC after: 1 week
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7867
Modified:
head/sys/dev/hyperv/netvsc/hv_net_vsc.h
head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_net_vsc.h Wed Sep 14 06:47:25 2016 (r305790)
+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.h Wed Sep 14 08:00:30 2016 (r305791)
@@ -198,7 +198,7 @@ struct hn_tx_ring {
/*
* Device-specific softc structure
*/
-typedef struct hn_softc {
+struct hn_softc {
struct ifnet *hn_ifp;
struct ifmedia hn_media;
device_t hn_dev;
@@ -243,7 +243,7 @@ typedef struct hn_softc {
uint32_t hn_ndis_ver;
struct ndis_rssprm_toeplitz hn_rss;
-} hn_softc_t;
+};
#define HN_FLAG_RXBUF_CONNECTED 0x0001
#define HN_FLAG_CHIM_CONNECTED 0x0002
Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Wed Sep 14 06:47:25 2016 (r305790)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Wed Sep 14 08:00:30 2016 (r305791)
@@ -312,8 +312,8 @@ static u_int hn_cpu_index;
/*
* Forward declarations
*/
-static void hn_stop(hn_softc_t *sc);
-static void hn_ifinit_locked(hn_softc_t *sc);
+static void hn_stop(struct hn_softc *sc);
+static void hn_ifinit_locked(struct hn_softc *sc);
static void hn_ifinit(void *xsc);
static int hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static int hn_start_locked(struct hn_tx_ring *txr, int len);
@@ -450,19 +450,17 @@ netvsc_probe(device_t dev)
static int
netvsc_attach(device_t dev)
{
+ struct hn_softc *sc = device_get_softc(dev);
struct sysctl_oid_list *child;
struct sysctl_ctx_list *ctx;
uint8_t eaddr[ETHER_ADDR_LEN];
uint32_t link_status;
- hn_softc_t *sc;
struct ifnet *ifp = NULL;
int error, ring_cnt, tx_ring_cnt;
#if __FreeBSD_version >= 1100045
int tso_maxlen;
#endif
- sc = device_get_softc(dev);
-
sc->hn_dev = dev;
sc->hn_prichan = vmbus_get_channel(dev);
@@ -1495,7 +1493,7 @@ skip:
static int
hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
- hn_softc_t *sc = ifp->if_softc;
+ struct hn_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
#ifdef INET
struct ifaddr *ifa = (struct ifaddr *)data;
@@ -1708,11 +1706,8 @@ hn_ioctl(struct ifnet *ifp, u_long cmd,
return (error);
}
-/*
- *
- */
static void
-hn_stop(hn_softc_t *sc)
+hn_stop(struct hn_softc *sc)
{
struct ifnet *ifp;
int ret, i;
@@ -1791,11 +1786,8 @@ do_sched:
}
}
-/*
- *
- */
static void
-hn_ifinit_locked(hn_softc_t *sc)
+hn_ifinit_locked(struct hn_softc *sc)
{
struct ifnet *ifp;
int ret, i;
@@ -1829,7 +1821,7 @@ hn_ifinit_locked(hn_softc_t *sc)
static void
hn_ifinit(void *xsc)
{
- hn_softc_t *sc = xsc;
+ struct hn_softc *sc = xsc;
NV_LOCK(sc);
if (sc->temp_unusable) {
@@ -3485,7 +3477,7 @@ static device_method_t netvsc_methods[]
static driver_t netvsc_driver = {
NETVSC_DEVNAME,
netvsc_methods,
- sizeof(hn_softc_t)
+ sizeof(struct hn_softc)
};
static devclass_t netvsc_devclass;
More information about the svn-src-all
mailing list