summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2003-06-23 14:09:24 +0000
committerJohannes Stezenbach <devnull@localhost>2003-06-23 14:09:24 +0000
commit9e89b13daae6f9249c528c9d10c6a09b2ad9a5bc (patch)
tree71b62a2da037539af9bf511fde33419c22227b23 /linux/drivers/media
parentb58b28d87b948bdb47f582b4d380d36012519c99 (diff)
downloadmediapointer-dvb-s2-9e89b13daae6f9249c528c9d10c6a09b2ad9a5bc.tar.gz
mediapointer-dvb-s2-9e89b13daae6f9249c528c9d10c6a09b2ad9a5bc.tar.bz2
get rid of trailing whitespace
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 4e7db9720..fb4e0162d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -1,4 +1,4 @@
-/*
+/*
* dvb_net.c
*
* Copyright (C) 2001 Convergence integrated media GmbH
@@ -9,19 +9,19 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *
+ *
*/
#include <linux/dvb/net.h>
@@ -57,24 +57,24 @@ struct dvb_net_priv {
/**
- * Determine the packet's protocol ID. The rule here is that we
+ * Determine the packet's protocol ID. The rule here is that we
* assume 802.3 if the type field is short enough to be a length.
* This is normal practice and works for any 'now in use' protocol.
*
* stolen from eth.c out of the linux kernel, hacked for dvb-device
* by Michael Holzt <kju@debian.org>
*/
-static
+static
unsigned short dvb_net_eth_type_trans(struct sk_buff *skb,
struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
-
+
skb->mac.raw=skb->data;
skb_pull(skb,dev->hard_header_len);
eth= skb->mac.ethernet;
-
+
if(*eth->h_dest & 1) {
if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN) == 0)
skb->pkt_type = PACKET_BROADCAST;
@@ -95,7 +95,7 @@ unsigned short dvb_net_eth_type_trans(struct sk_buff *skb,
*/
if (*(unsigned short *)rawp == 0xFFFF)
return htons(ETH_P_802_3);
-
+
/**
* Real 802.2 LLC
*/
@@ -103,7 +103,7 @@ unsigned short dvb_net_eth_type_trans(struct sk_buff *skb,
}
-static
+static
void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
{
u8 *eth;
@@ -144,7 +144,7 @@ void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
((struct dvb_net_priv *)dev->priv)->stats.rx_bytes += skb->len;
netif_rx(skb);
}
-
+
static
int dvb_net_callback (const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
@@ -154,7 +154,7 @@ int dvb_net_callback (const u8 *buffer1, size_t buffer1_len,
struct net_device *dev=(struct net_device *) filter->priv;
/**
- * we rely on the DVB API definition where exactly one complete
+ * we rely on the DVB API definition where exactly one complete
* section is delivered in buffer1
*/
dvb_net_sec (dev, (u8*) buffer1, buffer1_len);
@@ -185,7 +185,7 @@ int dvb_net_filter_set (struct net_device *dev,
*secfilter=0;
ret = priv->secfeed->allocate_filter(priv->secfeed, secfilter);
-
+
if (ret<0) {
printk("%s: could not get filter\n", dev->name);
return ret;
@@ -213,9 +213,9 @@ int dvb_net_filter_set (struct net_device *dev,
(*secfilter)->filter_mask[10] = mac_mask[1];
(*secfilter)->filter_mask[11] = mac_mask[0];
- dprintk("%s: filter mac=%02x %02x %02x %02x %02x %02x\n",
+ dprintk("%s: filter mac=%02x %02x %02x %02x %02x %02x\n",
dev->name, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
- dprintk("%s: filter mask=%02x %02x %02x %02x %02x %02x\n",
+ dprintk("%s: filter mask=%02x %02x %02x %02x %02x %02x\n",
dev->name, mac_mask[0], mac_mask[1], mac_mask[2],
mac_mask[3], mac_mask[4], mac_mask[5]);
@@ -229,11 +229,11 @@ int dvb_net_feed_start (struct net_device *dev)
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
struct dmx_demux *demux = priv->demux;
unsigned char *mac = (unsigned char *) dev->dev_addr;
-
+
priv->secfeed = 0;
priv->secfilter = 0;
- ret=demux->allocate_section_feed(demux, &priv->secfeed,
+ ret=demux->allocate_section_feed(demux, &priv->secfeed,
dvb_net_callback);
if (ret < 0) {
printk("%s: could not get section feed\n", dev->name);
@@ -249,14 +249,14 @@ int dvb_net_feed_start (struct net_device *dev)
return ret;
}
- if (priv->mode < 3)
+ if (priv->mode < 3)
dvb_net_filter_set(dev, &priv->secfilter, mac, mask_normal);
dprintk("%s: mode %i\n", __FUNCTION__, priv->mode);
switch (priv->mode) {
case 1:
- for (i=0; i<priv->multi_num; i++)
+ for (i=0; i<priv->multi_num; i++)
dvb_net_filter_set(dev, &priv->multi_secfilter[i],
priv->multi_macs[i], mask_normal);
break;
@@ -293,7 +293,7 @@ void dvb_net_feed_stop (struct net_device *dev)
for (i=0; i<priv->multi_num; i++) {
if (priv->multi_secfilter[i])
- priv->secfeed->release_filter(priv->secfeed,
+ priv->secfeed->release_filter(priv->secfeed,
priv->multi_secfilter[i]);
priv->multi_secfilter[i]=0;
}
@@ -340,23 +340,23 @@ void tq_set_multicast_list (void *data)
int mci;
struct dev_mc_list *mc;
- dprintk("%s: set_mc_list, %d entries\n",
+ dprintk("%s: set_mc_list, %d entries\n",
dev->name, dev->mc_count);
priv->mode = 1;
priv->multi_num = 0;
- for (mci=0, mc=dev->mc_list;
+ for (mci=0, mc=dev->mc_list;
mci<dev->mc_count;
mc=mc->next, mci++) {
dvb_set_mc_filter(dev, mc);
- }
+ }
}
dvb_net_feed_start(dev);
}
-
+
static
void dvb_net_set_multicast_list (struct net_device *dev)
{
@@ -423,7 +423,7 @@ int dvb_net_init_dev (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_config = dvb_net_set_config;
dev->set_mac_address = dvb_net_set_mac;
dev->mtu = 4096;
dev->mc_count = 0;
@@ -440,13 +440,13 @@ int get_if (struct dvb_net *dvbnet)
{
int i;
- for (i=0; i<DVB_NET_DEVICES_MAX; i++)
+ for (i=0; i<DVB_NET_DEVICES_MAX; i++)
if (!dvbnet->state[i])
break;
if (i == DVB_NET_DEVICES_MAX)
return -1;
-
+
dvbnet->state[i] = 1;
return i;
}
@@ -460,7 +460,7 @@ int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid)
struct dvb_net_priv *priv;
int result;
int if_num;
-
+
if ((if_num = get_if(dvbnet)) < 0)
return -EINVAL;
@@ -517,7 +517,7 @@ int dvb_net_remove_if(struct dvb_net *dvbnet, int num)
static
-int dvb_net_do_ioctl(struct inode *inode, struct file *file,
+int dvb_net_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
@@ -525,13 +525,13 @@ int dvb_net_do_ioctl(struct inode *inode, struct file *file,
if (((file->f_flags&O_ACCMODE) == O_RDONLY))
return -EPERM;
-
+
switch (cmd) {
case NET_ADD_IF:
{
struct dvb_net_if *dvbnetif = (struct dvb_net_if *)parg;
int result;
-
+
result = dvb_net_add_if(dvbnet, dvbnetif->pid);
if (result<0)
return result;
@@ -613,7 +613,7 @@ int dvb_net_init (struct dvb_adapter *adap, struct dvb_net *dvbnet,
dvbnet->demux = dmx;
- for (i=0; i<DVB_NET_DEVICES_MAX; i++)
+ for (i=0; i<DVB_NET_DEVICES_MAX; i++)
dvbnet->state[i] = 0;
dvb_register_device (adap, &dvbnet->dvbdev, &dvbdev_net,