Diff for /src/sys/net/if_var.h between versions 1.5 and 1.6

version 1.5, 2003/11/22 19:30:56 version 1.6, 2003/12/30 01:01:48
Line 82  struct ether_header; Line 82  struct ether_header;
 #include <sys/systm.h>          /* XXX */  #include <sys/systm.h>          /* XXX */
 #endif /* _KERNEL */  #endif /* _KERNEL */
   
   #define IF_DUNIT_NONE   -1
   
 TAILQ_HEAD(ifnethead, ifnet);   /* we use TAILQs so that the order of */  TAILQ_HEAD(ifnethead, ifnet);   /* we use TAILQs so that the order of */
 TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */  TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */
 TAILQ_HEAD(ifprefixhead, ifprefix);  TAILQ_HEAD(ifprefixhead, ifprefix);
Line 132  struct ifqueue { Line 134  struct ifqueue {
  */   */
 struct ifnet {  struct ifnet {
         void    *if_softc;              /* pointer to driver state */          void    *if_softc;              /* pointer to driver state */
        char    *if_name;               /* name, e.g. ``en'' or ``lo'' */        /* XXX if_name -> if_dname */
         const char *if_name;               /* name, e.g. ``en'' or ``lo'' */
         TAILQ_ENTRY(ifnet) if_link;     /* all struct ifnets are chained */          TAILQ_ENTRY(ifnet) if_link;     /* all struct ifnets are chained */
           char    if_xname[IFNAMSIZ];     /* external name (name + unit) */
         struct  ifaddrhead if_addrhead; /* linked list of addresses per if */          struct  ifaddrhead if_addrhead; /* linked list of addresses per if */
         int     if_pcount;              /* number of promiscuous listeners */          int     if_pcount;              /* number of promiscuous listeners */
         struct  bpf_if *if_bpf;         /* packet filter structure */          struct  bpf_if *if_bpf;         /* packet filter structure */
         u_short if_index;               /* numeric abbreviation for this if  */          u_short if_index;               /* numeric abbreviation for this if  */
           /* XXX if_unit -> if_dunit */
         short   if_unit;                /* sub-unit for lower level driver */          short   if_unit;                /* sub-unit for lower level driver */
         short   if_timer;               /* time 'til if_watchdog called */          short   if_timer;               /* time 'til if_watchdog called */
         short   if_flags;               /* up/down, broadcast, etc. */          short   if_flags;               /* up/down, broadcast, etc. */
Line 401  void if_attach(struct ifnet *); Line 406  void if_attach(struct ifnet *);
 int     if_delmulti(struct ifnet *, struct sockaddr *);  int     if_delmulti(struct ifnet *, struct sockaddr *);
 void    if_detach(struct ifnet *);  void    if_detach(struct ifnet *);
 void    if_down(struct ifnet *);  void    if_down(struct ifnet *);
   void    if_initname(struct ifnet *, const char *, int);
 int     if_printf(struct ifnet *, const char *, ...) __printflike(2, 3);  int     if_printf(struct ifnet *, const char *, ...) __printflike(2, 3);
 void    if_route(struct ifnet *, int flag, int fam);  void    if_route(struct ifnet *, int flag, int fam);
 int     if_setlladdr(struct ifnet *, const u_char *, int);  int     if_setlladdr(struct ifnet *, const u_char *, int);

Removed from v.1.5  
changed lines
  Added in v.1.6