diff options
| author | Patrick Boettcher <devnull@localhost> | 2004-10-20 17:47:53 +0000 |
|---|---|---|
| committer | Patrick Boettcher <devnull@localhost> | 2004-10-20 17:47:53 +0000 |
| commit | 7e90b701c97a5b0b1547973416eea669f26cee9d (patch) | |
| tree | 9ffa0e63fc63f2e94ddeee3729b6d9070dbd1dab | |
| parent | b6e0bc4cf1eebed71e6bd7f67bf1e3e7fc8764c6 (diff) | |
| download | mediapointer-dvb-s2-7e90b701c97a5b0b1547973416eea669f26cee9d.tar.gz mediapointer-dvb-s2-7e90b701c97a5b0b1547973416eea669f26cee9d.tar.bz2 | |
mac.ethernet is obsolete in kernel 2.6.9; ifdef for this
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 3e10e8926..d520a9885 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -37,6 +37,7 @@ #include <linux/uio.h> #include <asm/uaccess.h> #include <linux/crc32.h> +#include <linux/version.h> #include "dvb_demux.h" #include "dvb_net.h" @@ -140,7 +141,11 @@ static unsigned short dvb_net_eth_type_trans(struct sk_buff *skb, skb->mac.raw=skb->data; skb_pull(skb,dev->hard_header_len); - eth= skb->mac.ethernet; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8) + eth = skb->mac.ethernet; +#else + eth = eth_hdr(skb); +#endif if (*eth->h_dest & 1) { if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN)==0) |