diff options
author | brooks <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2005-06-10 16:49:24 +0000 |
commit | 567ba9b00a248431e7c1147c4e079fd7a11b9ecf (patch) | |
tree | f65b6d7834b40dfcd48534829a0a1e9529ab87ee /sys/net/if_sppp.h | |
parent | 3eaa67c3ad947d85be5350e0e184cd6ee5b93a52 (diff) | |
download | FreeBSD-src-567ba9b00a248431e7c1147c4e079fd7a11b9ecf.zip FreeBSD-src-567ba9b00a248431e7c1147c4e079fd7a11b9ecf.tar.gz |
Stop embedding struct ifnet at the top of driver softcs. Instead the
struct ifnet or the layer 2 common structure it was embedded in have
been replaced with a struct ifnet pointer to be filled by a call to the
new function, if_alloc(). The layer 2 common structure is also allocated
via if_alloc() based on the interface type. It is hung off the new
struct ifnet member, if_l2com.
This change removes the size of these structures from the kernel ABI and
will allow us to better manage them as interfaces come and go.
Other changes of note:
- Struct arpcom is no longer referenced in normal interface code.
Instead the Ethernet address is accessed via the IFP2ENADDR() macro.
To enforce this ac_enaddr has been renamed to _ac_enaddr.
- The second argument to ether_ifattach is now always the mac address
from driver private storage rather than sometimes being ac_enaddr.
Reviewed by: sobomax, sam
Diffstat (limited to 'sys/net/if_sppp.h')
-rw-r--r-- | sys/net/if_sppp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h index 39267ae..97f94b3 100644 --- a/sys/net/if_sppp.h +++ b/sys/net/if_sppp.h @@ -136,8 +136,7 @@ struct spppreq { #ifdef _KERNEL struct sppp { - /* NB: pp_if _must_ be first */ - struct ifnet pp_if; /* network interface data */ + struct ifnet *pp_ifp; /* network interface data */ struct ifqueue pp_fastq; /* fast output queue */ struct ifqueue pp_cpq; /* PPP control protocol queue */ struct sppp *pp_next; /* next interface in keepalive list */ @@ -204,6 +203,8 @@ struct sppp { void (*if_start) (struct ifnet *); struct callout ifstart_callout; /* if_start () scheduler */ }; +#define IFP2SP(ifp) ((struct sppp *)(ifp)->if_l2com) +#define SP2IFP(sp) ((sp)->pp_ifp) /* bits for pp_flags */ #define PP_KEEPALIVE 0x01 /* use keepalive protocol */ |