1 diff -ruN linux-atm-2.4.1/configure.in linux-atm-2.4.1.new/configure.in
2 --- linux-atm-2.4.1/configure.in 2003-04-25 04:17:05.000000000 +0200
3 +++ linux-atm-2.4.1.new/configure.in 2005-07-27 15:45:49.532396543 +0200
13 - src/maint/Makefile \
15 - src/ilmid/Makefile \
16 - src/ilmid/asn1/Makefile \
20 - src/mpoad/Makefile \
21 - src/switch/Makefile \
22 - src/switch/debug/Makefile \
23 - src/switch/tcp/Makefile \
24 - src/config/Makefile \
25 - src/config/init-redhat/Makefile \
26 - src/extra/Makefile \
27 - src/extra/linux-atm.spec \
28 - src/extra/ANS/Makefile
31 diff -ruN linux-atm-2.4.1/src/Makefile.am linux-atm-2.4.1.new/src/Makefile.am
32 --- linux-atm-2.4.1/src/Makefile.am 2001-10-03 23:14:53.000000000 +0200
33 +++ linux-atm-2.4.1.new/src/Makefile.am 2005-07-27 15:33:52.389309711 +0200
35 -SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
36 - mpoad switch config extra
37 +SUBDIRS = include lib
40 diff -Nur linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h linux-atm-2.4.1/src/include/linux/atmbr2684.h
41 --- linux-atm-2.4.1.orig/src/include/linux/atmbr2684.h 1970-01-01 01:00:00.000000000 +0100
42 +++ linux-atm-2.4.1/src/include/linux/atmbr2684.h 2005-11-13 00:06:42.000000000 +0100
44 +#ifndef _LINUX_ATMBR2684_H
45 +#define _LINUX_ATMBR2684_H
47 +#include <linux/atm.h>
48 +#include <linux/if.h> /* For IFNAMSIZ */
49 +#include <linux/if_ether.h> /* ETH_P_* */
52 + * Type of media we're bridging (ethernet, token ring, etc) Currently only
53 + * ethernet is supported
55 +#define BR2684_MEDIA_ETHERNET (0) /* 802.3 */
56 +#define BR2684_MEDIA_802_4 (1) /* 802.4 */
57 +#define BR2684_MEDIA_TR (2) /* 802.5 - token ring */
58 +#define BR2684_MEDIA_FDDI (3)
59 +#define BR2684_MEDIA_802_6 (4) /* 802.6 */
62 + * Is there FCS inbound on this VC? This currently isn't supported.
64 +#define BR2684_FCSIN_NO (0)
65 +#define BR2684_FCSIN_IGNORE (1)
66 +#define BR2684_FCSIN_VERIFY (2)
69 + * Is there FCS outbound on this VC? This currently isn't supported.
71 +#define BR2684_FCSOUT_NO (0)
72 +#define BR2684_FCSOUT_SENDZERO (1)
73 +#define BR2684_FCSOUT_GENERATE (2)
76 + * Does this VC include LLC encapsulation?
78 +#define BR2684_ENCAPS_VC (0) /* VC-mux */
79 +#define BR2684_ENCAPS_LLC (1)
80 +#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */
83 + * Is this VC bridged or routed?
86 +#define BR2684_PAYLOAD_ROUTED (0)
87 +#define BR2684_PAYLOAD_BRIDGED (1)
91 + * This is for the ATM_NEWBACKENDIF call - these are like socket families:
92 + * the first element of the structure is the backend number and the rest
93 + * is per-backend specific
95 +struct atm_newif_br2684 {
96 + atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
97 + int media; /* BR2684_MEDIA_* */
98 + char ifname[IFNAMSIZ];
100 + int payload; /* bridged or routed */
104 + * This structure is used to specify a br2684 interface - either by a
105 + * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
107 +#define BR2684_FIND_BYNOTHING (0)
108 +#define BR2684_FIND_BYNUM (1)
109 +#define BR2684_FIND_BYIFNAME (2)
110 +struct br2684_if_spec {
111 + int method; /* BR2684_FIND_* */
113 + char ifname[IFNAMSIZ];
119 + * This is for the ATM_SETBACKEND call - these are like socket families:
120 + * the first element of the structure is the backend number and the rest
121 + * is per-backend specific
123 +struct atm_backend_br2684 {
124 + atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
125 + struct br2684_if_spec ifspec;
126 + int fcs_in; /* BR2684_FCSIN_* */
127 + int fcs_out; /* BR2684_FCSOUT_* */
128 + int fcs_auto; /* 1: fcs_{in,out} disabled if no FCS rx'ed */
129 + int encaps; /* BR2684_ENCAPS_* */
130 + int payload; /* BR2684_PAYLOAD_* */
131 + int has_vpiid; /* 1: use vpn_id - Unsupported */
133 + int send_padding; /* unsupported */
134 + int min_size; /* we will pad smaller packets than this */
138 + * The BR2684_SETFILT ioctl is an experimental mechanism for folks
139 + * terminating a large number of IP-only vcc's. When netfilter allows
140 + * efficient per-if in/out filters, this support will be removed
142 +struct br2684_filter {
143 + __u32 prefix; /* network byte order */
144 + __u32 netmask; /* 0 = disable filter */
147 +struct br2684_filter_set {
148 + struct br2684_if_spec ifspec;
149 + struct br2684_filter filter;
152 +enum br2684_payload {
153 + p_routed = BR2684_PAYLOAD_ROUTED,
154 + p_bridged = BR2684_PAYLOAD_BRIDGED,
157 +#define BR2684_SETFILT _IOW( 'a', ATMIOC_BACKEND + 0, \
158 + struct br2684_filter_set)
160 +#endif /* _LINUX_ATMBR2684_H */