diff options
| author | Michael Hunold <devnull@localhost> | 2004-09-18 17:02:40 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-09-18 17:02:40 +0000 |
| commit | dc34bf5ddd262cbb5fc16f93adc59f84c406ddf0 (patch) | |
| tree | 29aeb79248cb6b23b04de26a2dd67cb28577f0c4 /linux/drivers/media/dvb | |
| parent | 3c77e284795c1a82953d3e510723413bfb1bd6da (diff) | |
| download | mediapointer-dvb-s2-dc34bf5ddd262cbb5fc16f93adc59f84c406ddf0.tar.gz mediapointer-dvb-s2-dc34bf5ddd262cbb5fc16f93adc59f84c406ddf0.tar.bz2 | |
Stuff backfeeded from 2.6.9-rc2-mm1:
- use struct kvec instead of struct iovec
- use correct format specifier in printk()
- implement dvb_net_set_config()
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 29bcb929f..c97cd5444 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -41,8 +41,7 @@ #include "dvb_demux.h" #include "dvb_net.h" - -static inline __u32 iov_crc32( __u32 c, struct iovec *iov, unsigned int cnt ) +static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt ) { unsigned int j; for (j = 0; j < cnt; j++) @@ -480,7 +479,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) /* Check CRC32, we've got it in our skb already. */ unsigned short ulen = htons(priv->ule_sndu_len); unsigned short utype = htons(priv->ule_sndu_type); - struct iovec iov[4] = { + struct kvec iov[4] = { { &ulen, sizeof ulen }, { &utype, sizeof utype }, { NULL, 0 }, @@ -562,7 +561,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, if (buffer2 != 0) printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2); if (buffer1_len > 32768) - printk(KERN_WARNING "length > 32k: %u.\n", buffer1_len); + printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", buffer1_len, buffer1_len / TS_SZ, buffer1); */ dvb_net_ule(dev, buffer1, buffer1_len); @@ -918,14 +917,6 @@ static void dvb_net_set_multicast_list (struct net_device *dev) } -static int dvb_net_set_config(struct net_device *dev, struct ifmap *map) -{ - if (netif_running(dev)) - return -EBUSY; - return 0; -} - - static void wq_restart_net_feed (void *data) { struct net_device *dev = data; @@ -983,7 +974,6 @@ static void dvb_net_setup(struct net_device *dev) dev->hard_start_xmit = dvb_net_tx; dev->get_stats = dvb_net_get_stats; dev->set_multicast_list = dvb_net_set_multicast_list; - dev->set_config = dvb_net_set_config; dev->set_mac_address = dvb_net_set_mac; dev->mtu = 4096; dev->mc_count = 0; |