| if_lagg.c (294615) | if_lagg.c (295796) |
|---|---|
| 1/* $OpenBSD: if_trunk.c,v 1.30 2007/01/31 06:20:19 reyk Exp $ */ 2 3/* 4 * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> 5 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org> 6 * Copyright (c) 2014, 2016 Marcelo Araujo <araujo@FreeBSD.org> 7 * 8 * Permission to use, copy, modify, and distribute this software for any --- 5 unchanged lines hidden (view full) --- 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 */ 20 21#include <sys/cdefs.h> | 1/* $OpenBSD: if_trunk.c,v 1.30 2007/01/31 06:20:19 reyk Exp $ */ 2 3/* 4 * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> 5 * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org> 6 * Copyright (c) 2014, 2016 Marcelo Araujo <araujo@FreeBSD.org> 7 * 8 * Permission to use, copy, modify, and distribute this software for any --- 5 unchanged lines hidden (view full) --- 14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 */ 20 21#include <sys/cdefs.h> |
| 22__FBSDID("$FreeBSD: head/sys/net/if_lagg.c 294615 2016-01-23 04:18:44Z araujo $"); | 22__FBSDID("$FreeBSD: head/sys/net/if_lagg.c 295796 2016-02-19 06:35:53Z araujo $"); |
| 23 24#include "opt_inet.h" 25#include "opt_inet6.h" 26 27#include <sys/param.h> 28#include <sys/kernel.h> 29#include <sys/malloc.h> 30#include <sys/mbuf.h> --- 1224 unchanged lines hidden (view full) --- 1255 ra->ra_size = count * sizeof(rpbuf); 1256 error = copyout(outbuf, ra->ra_port, ra->ra_size); 1257 free(outbuf, M_TEMP); 1258 break; 1259 case SIOCSLAGG: 1260 error = priv_check(td, PRIV_NET_LAGG); 1261 if (error) 1262 break; | 23 24#include "opt_inet.h" 25#include "opt_inet6.h" 26 27#include <sys/param.h> 28#include <sys/kernel.h> 29#include <sys/malloc.h> 30#include <sys/mbuf.h> --- 1224 unchanged lines hidden (view full) --- 1255 ra->ra_size = count * sizeof(rpbuf); 1256 error = copyout(outbuf, ra->ra_port, ra->ra_size); 1257 free(outbuf, M_TEMP); 1258 break; 1259 case SIOCSLAGG: 1260 error = priv_check(td, PRIV_NET_LAGG); 1261 if (error) 1262 break; |
| 1263 if (ra->ra_proto < 1 || ra->ra_proto >= LAGG_PROTO_MAX) { | 1263 if (ra->ra_proto >= LAGG_PROTO_MAX) { |
| 1264 error = EPROTONOSUPPORT; 1265 break; 1266 } 1267 1268 LAGG_WLOCK(sc); 1269 lagg_proto_detach(sc); 1270 LAGG_UNLOCK_ASSERT(sc); 1271 lagg_proto_attach(sc, ra->ra_proto); --- 969 unchanged lines hidden --- | 1264 error = EPROTONOSUPPORT; 1265 break; 1266 } 1267 1268 LAGG_WLOCK(sc); 1269 lagg_proto_detach(sc); 1270 LAGG_UNLOCK_ASSERT(sc); 1271 lagg_proto_attach(sc, ra->ra_proto); --- 969 unchanged lines hidden --- |