diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-20 17:10:16 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-20 17:10:16 -0300 |
commit | 262867e8085a15ec01bc95006875335195cb0476 (patch) | |
tree | d7c35e0678596bb311ffa314c03ff218773b1584 /linux | |
parent | 339b53cd63cba1452d2400ae31ec8ed60e84a18e (diff) | |
parent | f9d89fc637b04b27edfad537b4389bd5dfadc2f2 (diff) | |
download | mediapointer-dvb-s2-262867e8085a15ec01bc95006875335195cb0476.tar.gz mediapointer-dvb-s2-262867e8085a15ec01bc95006875335195cb0476.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/saa7134
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 75ed9c06e..b2e9c7971 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -821,7 +821,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, } -static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) +static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int +pkt_len) { u8 *eth; struct sk_buff *skb; @@ -923,7 +924,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, * we rely on the DVB API definition where exactly one complete * section is delivered in buffer1 */ - dvb_net_sec (dev, (u8*) buffer1, buffer1_len); + dvb_net_sec (dev, buffer1, buffer1_len); return 0; } |