From cea421d04b89cee8285b93d46326bbefb58566b7 Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Wed, 14 Apr 2004 17:10:56 +0000 Subject: - rename FEEDTYPE_SEC/TS to DVB_NET_FEEDTYPE_MPE/ULE - add binary compatibility cruft - return feedtype in NET_GET_IF - check feedtype for validity in NET_ADD_IF - fix a copy&paste bug in dvb_net_add_if() 2.4 vs. 2.6 - formatting and coding style fixes --- linux/include/linux/dvb/net.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/net.h b/linux/include/linux/dvb/net.h index ba44c6188..f9ec12062 100644 --- a/linux/include/linux/dvb/net.h +++ b/linux/include/linux/dvb/net.h @@ -1,4 +1,4 @@ -/* +/* * net.h * * Copyright (C) 2000 Marcus Metzler @@ -31,14 +31,23 @@ struct dvb_net_if { __u16 pid; __u16 if_num; __u8 feedtype; -#define FEEDTYPE_SEC 0 -#define FEEDTYPE_TS 1 +#define DVB_NET_FEEDTYPE_MPE 0 /* multi protocol encapsulation */ +#define DVB_NET_FEEDTYPE_ULE 1 /* ultra lightweight encapsulation */ }; -#define NET_ADD_IF _IOWR('o', 52, struct dvb_net_if) -#define NET_REMOVE_IF _IO('o', 53) -#define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) +#define NET_ADD_IF _IOWR('o', 52, struct dvb_net_if) +#define NET_REMOVE_IF _IO('o', 53) +#define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) -#endif /*_DVBNET_H_*/ +/* binary compatibility cruft: */ +struct __dvb_net_if_old { + __u16 pid; + __u16 if_num; +}; +#define __NET_ADD_IF_OLD _IOWR('o', 52, struct __dvb_net_if_old) +#define __NET_GET_IF_OLD _IOWR('o', 54, struct __dvb_net_if_old) + + +#endif /*_DVBNET_H_*/ -- cgit v1.2.3