Deleted Added
full compact
32c32
< * $FreeBSD: head/sys/dev/if_ndis/if_ndisvar.h 286410 2015-08-07 11:43:14Z glebius $
---
> * $FreeBSD: head/sys/dev/if_ndis/if_ndisvar.h 286437 2015-08-08 01:10:17Z adrian $
155,170c155,156
< u_int ndis_80211:1,
< ndis_link:1,
< ndis_running:1;
< union {
< struct { /* Ethernet */
< struct ifnet *ifp;
< struct ifmedia ifmedia;
< int ndis_if_flags;
< };
< struct { /* Wireless */
< struct ieee80211com ndis_ic;
< struct callout ndis_scan_callout;
< int (*ndis_newstate)(struct ieee80211com *,
< enum ieee80211_state, int);
< };
< };
---
> struct ifnet *ifp;
> struct ifmedia ifmedia; /* media info */
196a183
> struct callout ndis_scan_callout;
207a195,196
> int ndis_80211;
> int ndis_link;
209a199
> int ndis_if_flags;
210a201
>
229c220
< struct mbufq ndis_rxqueue;
---
> struct ifqueue ndis_rxqueue;
231a223,224
> int (*ndis_newstate)(struct ieee80211com *,
> enum ieee80211_state, int);