Deleted Added
full compact
if_iso88025subr.c (83130) if_iso88025subr.c (84931)
1/*
2 * Copyright (c) 1998, Larry Lile
3 * All rights reserved.
4 *
5 * For latest sources and information on this driver, please
6 * go to http://anarchy.stdio.com.
7 *
8 * Questions, comments or suggestions should be directed to

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * Copyright (c) 1998, Larry Lile
3 * All rights reserved.
4 *
5 * For latest sources and information on this driver, please
6 * go to http://anarchy.stdio.com.
7 *
8 * Questions, comments or suggestions should be directed to

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/sys/net/if_iso88025subr.c 83130 2001-09-06 02:40:43Z jlemon $
33 * $FreeBSD: head/sys/net/if_iso88025subr.c 84931 2001-10-14 20:17:53Z fjoe $
34 *
35 */
36
37/*
38 *
39 * General ISO 802.5 (Token Ring) support routines
40 *
41 */

--- 54 unchanged lines hidden (view full) ---

96
97 ifp->if_type = IFT_ISO88025;
98 ifp->if_addrlen = ISO88025_ADDR_LEN;
99 ifp->if_hdrlen = ISO88025_HDR_LEN;
100 if (ifp->if_baudrate == 0)
101 ifp->if_baudrate = TR_16MBPS; /* 16Mbit should be a safe default */
102 if (ifp->if_mtu == 0)
103 ifp->if_mtu = ISO88025_DEFAULT_MTU;
34 *
35 */
36
37/*
38 *
39 * General ISO 802.5 (Token Ring) support routines
40 *
41 */

--- 54 unchanged lines hidden (view full) ---

96
97 ifp->if_type = IFT_ISO88025;
98 ifp->if_addrlen = ISO88025_ADDR_LEN;
99 ifp->if_hdrlen = ISO88025_HDR_LEN;
100 if (ifp->if_baudrate == 0)
101 ifp->if_baudrate = TR_16MBPS; /* 16Mbit should be a safe default */
102 if (ifp->if_mtu == 0)
103 ifp->if_mtu = ISO88025_DEFAULT_MTU;
104 ifp->if_broadcastaddr = etherbroadcastaddr;
104
105 ifa = ifaddr_byindex(ifp->if_index);
106 if (ifa == 0) {
107 printf("iso88025_ifattach: no lladdr!\n");
108 return;
109 }
110 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
111 sdl->sdl_type = IFT_ISO88025;

--- 25 unchanged lines hidden (view full) ---

137 switch (command) {
138 case SIOCSIFADDR:
139 ifp->if_flags |= IFF_UP;
140
141 switch (ifa->ifa_addr->sa_family) {
142#ifdef INET
143 case AF_INET:
144 ifp->if_init(ifp->if_softc); /* before arpwhohas */
105
106 ifa = ifaddr_byindex(ifp->if_index);
107 if (ifa == 0) {
108 printf("iso88025_ifattach: no lladdr!\n");
109 return;
110 }
111 sdl = (struct sockaddr_dl *)ifa->ifa_addr;
112 sdl->sdl_type = IFT_ISO88025;

--- 25 unchanged lines hidden (view full) ---

138 switch (command) {
139 case SIOCSIFADDR:
140 ifp->if_flags |= IFF_UP;
141
142 switch (ifa->ifa_addr->sa_family) {
143#ifdef INET
144 case AF_INET:
145 ifp->if_init(ifp->if_softc); /* before arpwhohas */
145 arp_ifinit((struct arpcom *)ifp, ifa);
146 arp_ifinit(ifp, ifa);
146 break;
147#endif /* INET */
148#ifdef IPX
149 /*
150 * XXX - This code is probably wrong
151 */
152 case AF_IPX:
153 {

--- 113 unchanged lines hidden (view full) ---

267 (void)memcpy((caddr_t)gen_th.rd,
268 (caddr_t)sdl->sdl_route, rif_len - 2);
269 }
270 }
271
272 switch (dst->sa_family) {
273#ifdef INET
274 case AF_INET:
147 break;
148#endif /* INET */
149#ifdef IPX
150 /*
151 * XXX - This code is probably wrong
152 */
153 case AF_IPX:
154 {

--- 113 unchanged lines hidden (view full) ---

268 (void)memcpy((caddr_t)gen_th.rd,
269 (caddr_t)sdl->sdl_route, rif_len - 2);
270 }
271 }
272
273 switch (dst->sa_family) {
274#ifdef INET
275 case AF_INET:
275 if (!arpresolve(ac, rt, m, dst, edst, rt0))
276 if (!arpresolve(ifp, rt, m, dst, edst, rt0))
276 return (0); /* if not yet resolved */
277 snap_type = ETHERTYPE_IP;
278 break;
279#endif /* INET */
280#ifdef NOT_YET
281#ifdef INET6
282 case AF_INET6:
283 if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) {

--- 286 unchanged lines hidden ---
277 return (0); /* if not yet resolved */
278 snap_type = ETHERTYPE_IP;
279 break;
280#endif /* INET */
281#ifdef NOT_YET
282#ifdef INET6
283 case AF_INET6:
284 if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) {

--- 286 unchanged lines hidden ---