in6_gif.c (105340) | in6_gif.c (109623) |
---|---|
1/* $FreeBSD: head/sys/netinet6/in6_gif.c 105340 2002-10-17 17:47:55Z ume $ */ | 1/* $FreeBSD: head/sys/netinet6/in6_gif.c 109623 2003-01-21 08:56:16Z alfred $ */ |
2/* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ 3 4/* 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 130 unchanged lines hidden (view full) --- 140 printf("in6_gif_output: warning: unknown family %d passed\n", 141 family); 142#endif 143 m_freem(m); 144 return EAFNOSUPPORT; 145 } 146 147 /* prepend new IP header */ | 2/* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ 3 4/* 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 130 unchanged lines hidden (view full) --- 140 printf("in6_gif_output: warning: unknown family %d passed\n", 141 family); 142#endif 143 m_freem(m); 144 return EAFNOSUPPORT; 145 } 146 147 /* prepend new IP header */ |
148 M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT); | 148 M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT); |
149 if (m && m->m_len < sizeof(struct ip6_hdr)) 150 m = m_pullup(m, sizeof(struct ip6_hdr)); 151 if (m == NULL) { 152 printf("ENOBUFS in in6_gif_output %d\n", __LINE__); 153 return ENOBUFS; 154 } 155 156 ip6 = mtod(m, struct ip6_hdr *); --- 242 unchanged lines hidden --- | 149 if (m && m->m_len < sizeof(struct ip6_hdr)) 150 m = m_pullup(m, sizeof(struct ip6_hdr)); 151 if (m == NULL) { 152 printf("ENOBUFS in in6_gif_output %d\n", __LINE__); 153 return ENOBUFS; 154 } 155 156 ip6 = mtod(m, struct ip6_hdr *); --- 242 unchanged lines hidden --- |