| ip_gre.c (125020) | ip_gre.c (125024) |
|---|---|
| 1/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */ | 1/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */ |
| 2/* $FreeBSD: head/sys/netinet/ip_gre.c 125020 2004-01-26 12:21:59Z sobomax $ */ | 2/* $FreeBSD: head/sys/netinet/ip_gre.c 125024 2004-01-26 12:33:56Z sobomax $ */ |
| 3 4/* 5 * Copyright (c) 1998 The NetBSD Foundation, Inc. 6 * All rights reserved. 7 * 8 * This code is derived from software contributed to The NetBSD Foundation 9 * by Heiko W.Rupp <hwr@pilhuhn.de> 10 * --- 161 unchanged lines hidden (view full) --- 172 if (flags & GRE_RP) 173 return (0); 174 if (flags & GRE_KP) 175 hlen += 4; 176 if (flags & GRE_SP) 177 hlen += 4; 178 179 switch (ntohs(gip->gi_ptype)) { /* ethertypes */ | 3 4/* 5 * Copyright (c) 1998 The NetBSD Foundation, Inc. 6 * All rights reserved. 7 * 8 * This code is derived from software contributed to The NetBSD Foundation 9 * by Heiko W.Rupp <hwr@pilhuhn.de> 10 * --- 161 unchanged lines hidden (view full) --- 172 if (flags & GRE_RP) 173 return (0); 174 if (flags & GRE_KP) 175 hlen += 4; 176 if (flags & GRE_SP) 177 hlen += 4; 178 179 switch (ntohs(gip->gi_ptype)) { /* ethertypes */ |
| 180 case ETHERTYPE_IP: /* shouldn't need a schednetisr(), as */ 181 case WCCP_PROTOCOL_TYPE: /* we are in ip_input */ 182 isr = NETISR_IP; | 180 case WCCP_PROTOCOL_TYPE: 181 if (sc->wccp_ver == WCCP_V2) 182 hlen += 4; 183 /* FALLTHROUGH */ 184 case ETHERTYPE_IP: /* shouldn't need a schednetisr(), */ 185 isr = NETISR_IP;/* as we are in ip_input */ |
| 183 break; 184#ifdef NETATALK 185 case ETHERTYPE_ATALK: 186 isr = NETISR_ATALK1; 187 break; 188#endif 189 case ETHERTYPE_IPV6: 190 /* FALLTHROUGH */ --- 143 unchanged lines hidden --- | 186 break; 187#ifdef NETATALK 188 case ETHERTYPE_ATALK: 189 isr = NETISR_ATALK1; 190 break; 191#endif 192 case ETHERTYPE_IPV6: 193 /* FALLTHROUGH */ --- 143 unchanged lines hidden --- |