Commit 351d7dda authored by Ben Collins's avatar Ben Collins

IEEE1394/ETH1394(r1147): Make sure to set update_config_rom on add host.

parent 228beab6
...@@ -606,8 +606,8 @@ static void ether1394_add_host (struct hpsb_host *host) ...@@ -606,8 +606,8 @@ static void ether1394_add_host (struct hpsb_host *host)
goto out; goto out;
} }
ETH1394_PRINT (KERN_ERR, dev->name, "IEEE-1394 IPv4 over 1394 Ethernet (%s)\n", ETH1394_PRINT (KERN_ERR, dev->name, "IEEE-1394 IPv4 over 1394 Ethernet (fw-host%d)\n",
host->driver->name); host->id);
hi->host = host; hi->host = host;
hi->dev = dev; hi->dev = dev;
...@@ -641,6 +641,7 @@ static void ether1394_add_host (struct hpsb_host *host) ...@@ -641,6 +641,7 @@ static void ether1394_add_host (struct hpsb_host *host)
"Config ROM\n"); "Config ROM\n");
goto out; goto out;
} }
hi->host->update_config_rom = 1;
return; return;
out: out:
...@@ -1683,7 +1684,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev) ...@@ -1683,7 +1684,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
IN_MULTICAST(__constant_ntohl(skb->nh.iph->daddr)))) { IN_MULTICAST(__constant_ntohl(skb->nh.iph->daddr)))) {
tx_type = ETH1394_GASP; tx_type = ETH1394_GASP;
dest_node = LOCAL_BUS | ALL_NODES; dest_node = LOCAL_BUS | ALL_NODES;
max_payload = priv->bc_maxpayload - ETHER1394_GASP_OVERHEAD; max_payload = priv->bc_maxpayload;
BUG_ON(max_payload < (512 - ETHER1394_GASP_OVERHEAD)); BUG_ON(max_payload < (512 - ETHER1394_GASP_OVERHEAD));
dgl = priv->bc_dgl; dgl = priv->bc_dgl;
if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF]) if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment