Tue Apr 18 21:29:40 2017 UTC ()
include socketvar.h, so avoid a warning on struct sockopt *


(bouyer)
diff -r1.1.2.6 -r1.1.2.7 src/sys/netcan/can_var.h
cvs diff -r1.1.2.6 -r1.1.2.7 src/sys/netcan/can_var.h (expand / switch to unified diff)

--- src/sys/netcan/can_var.h 2017/04/18 20:37:38 1.1.2.6
+++ src/sys/netcan/can_var.h 2017/04/18 21:29:40 1.1.2.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: can_var.h,v 1.1.2.6 2017/04/18 20:37:38 bouyer Exp $ */ 1/* $NetBSD: can_var.h,v 1.1.2.7 2017/04/18 21:29:40 bouyer Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Robert Swindells and Manuel Bouyer 8 * by Robert Swindells and Manuel Bouyer
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -31,26 +31,27 @@ @@ -31,26 +31,27 @@
31 31
32#ifndef _NETCAN_CAN_VAR_H_ 32#ifndef _NETCAN_CAN_VAR_H_
33#define _NETCAN_CAN_VAR_H_ 33#define _NETCAN_CAN_VAR_H_
34 34
35#include <sys/queue.h> 35#include <sys/queue.h>
36#include <sys/device.h> 36#include <sys/device.h>
37#include <netcan/can_link.h> 37#include <netcan/can_link.h>
38 38
39struct can_ifreq { 39struct can_ifreq {
40 char cfr_name[IFNAMSIZ]; /* if name, e.g. "sja0" */ 40 char cfr_name[IFNAMSIZ]; /* if name, e.g. "sja0" */
41}; 41};
42 42
43#ifdef _KERNEL 43#ifdef _KERNEL
 44#include <sys/socketvar.h>
44 45
45/* 46/*
46 * common structure for CAN interface drivers. Should be at the start of 47 * common structure for CAN interface drivers. Should be at the start of
47 * each driver's softc. 48 * each driver's softc.
48 */ 49 */
49struct canif_softc { 50struct canif_softc {
50 device_t csc_dev; 51 device_t csc_dev;
51 struct can_link_timecaps csc_timecaps; /* timing capabilities */ 52 struct can_link_timecaps csc_timecaps; /* timing capabilities */
52 struct can_link_timings csc_timings; /* operating timing values */ 53 struct can_link_timings csc_timings; /* operating timing values */
53 uint32_t csc_linkmodes; 54 uint32_t csc_linkmodes;
54}; 55};
55 56
56extern struct ifqueue canintrq; 57extern struct ifqueue canintrq;