diff options
-rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_demux.h | 3 | ||||
-rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h index 896703f79..03f8337ce 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h @@ -25,6 +25,9 @@ #ifndef _DVB_DEMUX_H_ #define _DVB_DEMUX_H_ +#include <asm/semaphore.h> +#include <linux/timer.h> + #include "demux.h" #define DMX_TYPE_TS 0 diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 8d2c9e5e1..0ee9a902d 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -94,7 +94,7 @@ unsigned short my_eth_type_trans(struct sk_buff *skb, struct net_device *dev) } static void -dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) +dvb_net_sec(struct net_device *dev, const u8 *pkt, int pkt_len) { u8 *eth; struct sk_buff *skb; @@ -131,8 +131,8 @@ dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) } static int -dvb_net_callback(u8 *buffer1, size_t buffer1_len, - u8 *buffer2, size_t buffer2_len, +dvb_net_callback(const u8 *buffer1, size_t buffer1_len, + const u8 *buffer2, size_t buffer2_len, dmx_section_filter_t *filter, dmx_success_t success) { |