diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/atari_bionet.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/atari_bionet.c')
| -rw-r--r-- | drivers/net/atari_bionet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c index 5e5f80b99b9e..92b52138acad 100644 --- a/drivers/net/atari_bionet.c +++ b/drivers/net/atari_bionet.c @@ -460,7 +460,7 @@ bionet_send_packet(struct sk_buff *skb, struct net_device *dev) { if (bionet_debug >1) { u_char *data = nic_packet->buffer, *p; int i; - + printk( "%s: TX pkt type 0x%4x from ", dev->name, ((u_short *)data)[6]); @@ -551,7 +551,7 @@ bionet_poll_rx(struct net_device *dev) { /* 'skb->data' points to the start of sk_buff data area. */ memcpy(skb->data, nic_packet->buffer, pkt_len); - skb->protocol = eth_type_trans( skb, dev ); + skb->protocol = eth_type_trans( skb, dev ); netif_rx(skb); dev->last_rx = jiffies; lp->stats.rx_packets++; @@ -565,17 +565,17 @@ bionet_poll_rx(struct net_device *dev) { if (bionet_debug >1) { u_char *data = nic_packet->buffer, *p; int i; - + printk( "%s: RX pkt type 0x%4x from ", dev->name, ((u_short *)data)[6]); - - + + for( p = &data[6], i = 0; i < 6; i++ ) printk("%02x%s", *p++,i != 5 ? ":" : "" ); printk(" to "); for( p = data, i = 0; i < 6; i++ ) printk("%02x%s", *p++,i != 5 ? ":" : "" "\n" ); - + printk( "%s: ", dev->name ); printk(" data %02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x" " %02x%02x%02x%02x len %d\n", @@ -636,7 +636,7 @@ bionet_close(struct net_device *dev) { /* Get the current statistics. This may be called with the card open or closed. */ -static struct net_device_stats *net_get_stats(struct net_device *dev) +static struct net_device_stats *net_get_stats(struct net_device *dev) { struct net_local *lp = netdev_priv(dev); return &lp->stats; |