Hello!
Ok, lets take the incremental approach ;-).
See attached for an updated version of the patch.
Restore the original dvb_net.c in drivers/media/dvb/dvb-core
(e.g. by using hg revert dvb_net.c) and then re-apply the patch.
Cheers,
Christian.
Gregoire Favre wrote:
On Thu, Jul 12, 2007 at 04:11:03PM +0200, Christian Praehauser wrote:
The attached patch should fix this (not tested).
Try
patch -p0 < dvb_net_skb_mac.patch
in the directory hvr4000/linux and then recompile.
Hello,
thank for the patch :-)
Yes it did, now it fails at :
CC [M] /usr/src/CVS/hvr4000/v4l/dvb_net.o
/usr/src/CVS/hvr4000/v4l/dvb_net.c: In function 'dvb_net_eth_type_trans':
/usr/src/CVS/hvr4000/v4l/dvb_net.c:186: error: request for member 'raw' in something not a structure or union
/usr/src/CVS/hvr4000/v4l/dvb_net.c: In function 'dvb_net_ule':
/usr/src/CVS/hvr4000/v4l/dvb_net.c:625: warning: cast to pointer from integer of different size
/usr/src/CVS/hvr4000/v4l/dvb_net.c:626: warning: cast to pointer from integer of different size
/usr/src/CVS/hvr4000/v4l/dvb_net.c:627: warning: cast to pointer from integer of different size
/usr/src/CVS/hvr4000/v4l/dvb_net.c:628: warning: cast to pointer from integer of different size
make[2]: *** [/usr/src/CVS/hvr4000/v4l/dvb_net.o] Error 1
make[1]: *** [_module_/usr/src/CVS/hvr4000/v4l] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.22'
make: *** [default] Error 2
Maybe I'll just wait for an update of the hvr4000 tree :-)
--
Christian Praehauser <cpraehaus@xxxxxxxxxxxxxx>
|| //\\//\\ || Multimedia Communications Group,
||// \/ \\|| Department of Computer Sciences, University of Salzburg
http://www.cosy.sbg.ac.at/~cpraehaus/
http://www.network-research.org/
http://www.uni-salzburg.at/
--- drivers/media/dvb/dvb-core/dvb_net.c.orig 2007-07-13 11:37:40.000000000 +0200
+++ drivers/media/dvb/dvb-core/dvb_net.c 2007-07-13 11:37:52.000000000 +0200
@@ -183,7 +183,12 @@ static unsigned short dvb_net_eth_type_t
struct ethhdr *eth;
unsigned char *rawp;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
skb->mac.raw=skb->data;
+#else
+ skb_set_mac_header(skb);
+#endif
+
skb_pull(skb,dev->hard_header_len);
eth = eth_hdr(skb);
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
