diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/ieee1394/eth1394.c | |
parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r-- | drivers/ieee1394/eth1394.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index cd53c174ced1..4802bbbb6dc9 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -89,7 +89,7 @@ | |||
89 | #define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__) | 89 | #define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__) |
90 | 90 | ||
91 | static char version[] __devinitdata = | 91 | static char version[] __devinitdata = |
92 | "$Rev: 1264 $ Ben Collins <bcollins@debian.org>"; | 92 | "$Rev: 1312 $ Ben Collins <bcollins@debian.org>"; |
93 | 93 | ||
94 | struct fragment_info { | 94 | struct fragment_info { |
95 | struct list_head list; | 95 | struct list_head list; |
@@ -221,9 +221,7 @@ static int ether1394_open (struct net_device *dev) | |||
221 | if (priv->bc_state == ETHER1394_BC_ERROR) { | 221 | if (priv->bc_state == ETHER1394_BC_ERROR) { |
222 | /* we'll try again */ | 222 | /* we'll try again */ |
223 | priv->iso = hpsb_iso_recv_init(priv->host, | 223 | priv->iso = hpsb_iso_recv_init(priv->host, |
224 | ETHER1394_GASP_BUFFERS * 2 * | 224 | ETHER1394_ISO_BUF_SIZE, |
225 | (1 << (priv->host->csr.max_rec + | ||
226 | 1)), | ||
227 | ETHER1394_GASP_BUFFERS, | 225 | ETHER1394_GASP_BUFFERS, |
228 | priv->broadcast_channel, | 226 | priv->broadcast_channel, |
229 | HPSB_ISO_DMA_PACKET_PER_BUFFER, | 227 | HPSB_ISO_DMA_PACKET_PER_BUFFER, |
@@ -635,8 +633,8 @@ static void ether1394_add_host (struct hpsb_host *host) | |||
635 | * be checked when the eth device is opened. */ | 633 | * be checked when the eth device is opened. */ |
636 | priv->broadcast_channel = host->csr.broadcast_channel & 0x3f; | 634 | priv->broadcast_channel = host->csr.broadcast_channel & 0x3f; |
637 | 635 | ||
638 | priv->iso = hpsb_iso_recv_init(host, (ETHER1394_GASP_BUFFERS * 2 * | 636 | priv->iso = hpsb_iso_recv_init(host, |
639 | (1 << (host->csr.max_rec + 1))), | 637 | ETHER1394_ISO_BUF_SIZE, |
640 | ETHER1394_GASP_BUFFERS, | 638 | ETHER1394_GASP_BUFFERS, |
641 | priv->broadcast_channel, | 639 | priv->broadcast_channel, |
642 | HPSB_ISO_DMA_PACKET_PER_BUFFER, | 640 | HPSB_ISO_DMA_PACKET_PER_BUFFER, |
@@ -1770,7 +1768,7 @@ fail: | |||
1770 | static void ether1394_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1768 | static void ether1394_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1771 | { | 1769 | { |
1772 | strcpy (info->driver, driver_name); | 1770 | strcpy (info->driver, driver_name); |
1773 | strcpy (info->version, "$Rev: 1264 $"); | 1771 | strcpy (info->version, "$Rev: 1312 $"); |
1774 | /* FIXME XXX provide sane businfo */ | 1772 | /* FIXME XXX provide sane businfo */ |
1775 | strcpy (info->bus_info, "ieee1394"); | 1773 | strcpy (info->bus_info, "ieee1394"); |
1776 | } | 1774 | } |