mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
7b5b74efcc
This reverts commitcf00713a65("include/uapi/linux/atm_zatm.h: include linux/time.h"). This attempted to fix userspace breakage that no longer existed when the patch was merged. Almost one year earlier, commit70ba07b675("atm: remove 'struct zatm_t_hist'") deleted the struct in question. After this patch was merged, we now have to deal with people being unable to include this header in conjunction with standard C library headers like stdlib.h (which linux-atm does). Example breakage: x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I./../q2931 -I./../saal \ -I. -DCPPFLAGS_TEST -I../../src/include -O2 -march=native -pipe -g \ -frecord-gcc-switches -freport-bug -Wimplicit-function-declaration \ -Wnonnull -Wstrict-aliasing -Wparentheses -Warray-bounds \ -Wfree-nonheap-object -Wreturn-local-addr -fno-strict-aliasing -Wall \ -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c zntune.c In file included from /usr/include/linux/atm_zatm.h:17:0, from zntune.c:17: /usr/include/linux/time.h:9:8: error: redefinition of ‘struct timespec’ struct timespec { ^ In file included from /usr/include/sys/select.h:43:0, from /usr/include/sys/types.h:219, from /usr/include/stdlib.h:314, from zntune.c:9: /usr/include/time.h:120:8: note: originally defined here struct timespec ^ Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
/* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
|
|
driver-specific utilities) */
|
|
|
|
/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
|
|
#ifndef LINUX_ATM_ZATM_H
|
|
#define LINUX_ATM_ZATM_H
|
|
|
|
/*
|
|
* Note: non-kernel programs including this file must also include
|
|
* sys/types.h for struct timeval
|
|
*/
|
|
|
|
#include <linux/atmapi.h>
|
|
#include <linux/atmioc.h>
|
|
|
|
#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
|
|
/* get pool statistics */
|
|
#define ZATM_GETPOOLZ _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc)
|
|
/* get statistics and zero */
|
|
#define ZATM_SETPOOL _IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc)
|
|
/* set pool parameters */
|
|
|
|
struct zatm_pool_info {
|
|
int ref_count; /* free buffer pool usage counters */
|
|
int low_water,high_water; /* refill parameters */
|
|
int rqa_count,rqu_count; /* queue condition counters */
|
|
int offset,next_off; /* alignment optimizations: offset */
|
|
int next_cnt,next_thres; /* repetition counter and threshold */
|
|
};
|
|
|
|
struct zatm_pool_req {
|
|
int pool_num; /* pool number */
|
|
struct zatm_pool_info info; /* actual information */
|
|
};
|
|
|
|
#define ZATM_OAM_POOL 0 /* free buffer pool for OAM cells */
|
|
#define ZATM_AAL0_POOL 1 /* free buffer pool for AAL0 cells */
|
|
#define ZATM_AAL5_POOL_BASE 2 /* first AAL5 free buffer pool */
|
|
#define ZATM_LAST_POOL ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */
|
|
|
|
#define ZATM_TIMER_HISTORY_SIZE 16 /* number of timer adjustments to
|
|
record; must be 2^n */
|
|
|
|
#endif
|