sys/ultrix/kpatch-4.2

   1 *** ../sys.old/conf/files       Wed Jun 19 14:23:30 1991
   2 --- ./conf/files        Fri Mar  6 18:06:45 1992
   3 ***************
   4 *** 75,80 ****
   5 --- 75,87 ----
   6   net/netinet/tcp_timer.c       optional inet Binary
   7   net/netinet/tcp_usrreq.c      optional inet Binary
   8   net/netinet/udp_usrreq.c      optional inet Binary
   9 + net/netatalk/aarp.c   optional atalk
  10 + net/netatalk/at_control.c     optional atalk
  11 + net/netatalk/at_proto.c       optional atalk
  12 + net/netatalk/at_ultrix.c      optional atalk
  13 + net/netatalk/ddp_input.c      optional atalk
  14 + net/netatalk/ddp_output.c     optional atalk
  15 + net/netatalk/ddp_usrreq.c     optional atalk
  16   net/netbsc/bsc_pcb.c  optional bsc Binary
  17   net/netbsc/bsc_proto.c        optional bsc
  18   net/netbsc/bsc_states.c       optional bsc Binary
  19 *** ../sys.old/data/af_data.c   Mon Apr 29 15:45:53 1991
  20 --- ./data/af_data.c    Sun Mar  8 22:25:15 1992
  21 ***************
  22 *** 69,74 ****
  23 --- 69,82 ----
  24   #define AFNS  AFNULL
  25   #endif NS
  26
  27 + #ifdef ATALK
  28 + extern int atalk_hash(), atalk_netmatch();
  29 + #define AFATALK \
  30 +       { atalk_hash,   atalk_netmatch }
  31 + #else
  32 + #define AFATALK       AFNULL
  33 + #endif
  34 +
  35   #ifdef BINARY
  36
  37   extern        struct afswitch afswitch[];
  38 ***************
  39 *** 78,83 ****
  40   struct afswitch afswitch[AF_MAX] = {
  41         AFNULL, AFNULL, AFINET, AFINET, AFPUP,
  42         AFNULL, AFNS,   AFNULL, AFNULL, AFNULL,
  43 !       AFNULL
  44   };
  45   #endif
  46 --- 86,92 ----
  47   struct afswitch afswitch[AF_MAX] = {
  48         AFNULL, AFNULL, AFINET, AFINET, AFPUP,
  49         AFNULL, AFNS,   AFNULL, AFNULL, AFNULL,
  50 !       AFNULL, AFNULL, AFNULL, AFNULL, AFNULL,
  51 !       AFNULL, AFATALK, AFNULL, AFNULL, AFNULL,
  52   };
  53   #endif
  54 *** ../sys.old/data/if_to_proto_data.c  Mon Apr 29 15:46:34 1991
  55 --- ./data/if_to_proto_data.c   Thu Jun  3 11:53:44 1993
  56 ***************
  57 *** 125,130 ****
  58 --- 125,143 ----
  59           { ETHERTYPE_RC,         AF_DLI,         0,              0 }
  60   #endif
  61
  62 + /*
  63 +  * Hook for netatalk.  We receive all packets.  If we're not interested
  64 +  * in the packet, we do a normal search on if_family for someone else
  65 +  * who might want the packet.
  66 +  */
  67 + #ifdef ATALK
  68 + #include "atalk.h"
  69 + #undef s_net
  70 + #include "../net/netatalk/at.h"
  71 + #define ETHER_ATALK \
  72 +       { -1,                   AF_APPLETALK,   ATPROTO_DDP,    0 }
  73 + #endif ATALK
  74 +
  75   #ifdef        BINARY
  76
  77   extern struct if_family if_family[];
  78 ***************
  79 *** 134,139 ****
  80 --- 148,156 ----
  81   /* INET specific stuff is kept in drivers for now */
  82
  83   struct if_family if_family[] = {
  84 + #ifdef ETHER_ATALK
  85 +       ETHER_ATALK,
  86 + #endif
  87   #ifdef ETHER_DECNET
  88         ETHER_DECNET,
  89   #endif
  90 *** ../sys.old/data/uipc_domain_data.c  Mon Apr 29 15:47:08 1991
  91 --- ./data/uipc_domain_data.c   Mon Mar  2 15:24:28 1992
  92 ***************
  93 *** 123,128 ****
  94 --- 123,132 ----
  95         ADDDOMAIN(x25);
  96   #endif XXXVNATV
  97   #endif X25_DONE
  98 + #ifdef ATALK
  99 + #include "atalk.h"
 100 +       ADDDOMAIN(atalk);
 101 + #endif ATALK
 102
 103   #endif
 104
 105 *** ../sys.old/net/net/conf_net.c       Mon Apr 29 16:16:23 1991
 106 --- ./net/net/conf_net.c        Sun Mar  8 22:28:32 1992
 107 ***************
 108 *** 233,238 ****
 109 --- 233,242 ----
 110   extern int ddpintr();
 111   #endif
 112
 113 + #ifdef ATALK
 114 + extern int atintr();
 115 + #endif
 116 +
 117   #include "../net/net/netisr.h"
 118   /*
 119    * table of interrupt vectors - scanned in locore when sofware
 120 ***************
 121 *** 272,277 ****
 122 --- 276,284 ----
 123   #if NLAT == 1
 124         {NETISR_LAT,latintr},
 125   #endif /* NLAT */
 126 + #ifdef ATALK
 127 +       {NETISR_AT,atintr},
 128 + #endif ATALK
 129   #ifdef APPLETALK
 130         {NETISR_DDP,ddpintr},
 131   #endif APPLETALK
 132 *** ../sys.old/net/net/netisr.h Mon Apr 29 16:16:21 1991
 133 --- ./net/net/netisr.h  Sun Mar  8 22:29:04 1992
 134 ***************
 135 *** 72,77 ****
 136 --- 72,78 ----
 137   #define NETISR_DLI    13              /* same as AF_DLI */
 138   #define NETISR_LAT    14              /* same as AF_LAT */
 139   #define NETISR_BSC    15              /* same as AF_BSC */
 140 + #define NETISR_AT     16              /* same as AF_APPLETALK */
 141   #define NETISR_DLO      19              /* same as AF_OSI */
 142
 143   #define       schednetisr(anisr)      { set_bit_atomic(anisr,&netisr); setsoftnet(); }