git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
ieee1394
/
eth1394.c
diff --git
a/drivers/ieee1394/eth1394.c
b/drivers/ieee1394/eth1394.c
index
2d5b57b
..
97e5c3d
100644
(file)
--- a/
drivers/ieee1394/eth1394.c
+++ b/
drivers/ieee1394/eth1394.c
@@
-64,19
+64,20
@@
#include <linux/ethtool.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
#include <linux/ethtool.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
-#include <asm/
semaphore
.h>
+#include <asm/
unaligned
.h>
#include <net/arp.h>
#include <net/arp.h>
+#include "config_roms.h"
#include "csr1212.h"
#include "csr1212.h"
-#include "ieee1394_types.h"
+#include "eth1394.h"
+#include "highlevel.h"
+#include "ieee1394.h"
#include "ieee1394_core.h"
#include "ieee1394_core.h"
+#include "ieee1394_hotplug.h"
#include "ieee1394_transactions.h"
#include "ieee1394_transactions.h"
-#include "ieee1394.h"
-#include "highlevel.h"
+#include "ieee1394_types.h"
#include "iso.h"
#include "nodemgr.h"
#include "iso.h"
#include "nodemgr.h"
-#include "eth1394.h"
-#include "config_roms.h"
#define ETH1394_PRINT_G(level, fmt, args...) \
printk(level "%s: " fmt, driver_name, ## args)
#define ETH1394_PRINT_G(level, fmt, args...) \
printk(level "%s: " fmt, driver_name, ## args)
@@
-132,7
+133,7
@@
struct eth1394_node_info {
#define ETH1394_DRIVER_NAME "eth1394"
static const char driver_name[] = ETH1394_DRIVER_NAME;
#define ETH1394_DRIVER_NAME "eth1394"
static const char driver_name[] = ETH1394_DRIVER_NAME;
-static
kmem_cache_t
*packet_task_cache;
+static
struct kmem_cache
*packet_task_cache;
static struct hpsb_highlevel eth1394_highlevel;
static struct hpsb_highlevel eth1394_highlevel;
@@
-473,12
+474,10
@@
static struct ieee1394_device_id eth1394_id_table[] = {
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
static struct hpsb_protocol_driver eth1394_proto_driver = {
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
static struct hpsb_protocol_driver eth1394_proto_driver = {
- .name =
"IPv4 over 1394 Driver"
,
+ .name =
ETH1394_DRIVER_NAME
,
.id_table = eth1394_id_table,
.update = eth1394_update,
.driver = {
.id_table = eth1394_id_table,
.update = eth1394_update,
.driver = {
- .name = ETH1394_DRIVER_NAME,
- .bus = &ieee1394_bus_type,
.probe = eth1394_probe,
.remove = eth1394_remove,
},
.probe = eth1394_probe,
.remove = eth1394_remove,
},
@@
-491,7
+490,7
@@
static void ether1394_reset_priv (struct net_device *dev, int set_mtu)
int i;
struct eth1394_priv *priv = netdev_priv(dev);
struct hpsb_host *host = priv->host;
int i;
struct eth1394_priv *priv = netdev_priv(dev);
struct hpsb_host *host = priv->host;
- u64 guid =
*
((u64*)&(host->csr.rom->bus_info_data[3]));
+ u64 guid =
get_unaligned
((u64*)&(host->csr.rom->bus_info_data[3]));
u16 maxpayload = 1 << (host->csr.max_rec + 1);
int max_speed = IEEE1394_SPEED_MAX;
u16 maxpayload = 1 << (host->csr.max_rec + 1);
int max_speed = IEEE1394_SPEED_MAX;
@@
-514,8
+513,8
@@
static void ether1394_reset_priv (struct net_device *dev, int set_mtu)
ETHER1394_GASP_OVERHEAD)));
/* Set our hardware address while we're at it */
ETHER1394_GASP_OVERHEAD)));
/* Set our hardware address while we're at it */
-
*(u64*)dev->dev_addr = guid
;
-
*(u64*)dev->broadcast = ~0x0ULL
;
+
memcpy(dev->dev_addr, &guid, sizeof(u64))
;
+
memset(dev->broadcast, 0xff, sizeof(u64))
;
}
spin_unlock_irqrestore (&priv->lock, flags);
}
spin_unlock_irqrestore (&priv->lock, flags);
@@
-894,6
+893,7
@@
static inline u16 ether1394_parse_encap(struct sk_buff *skb,
u16 maxpayload;
struct eth1394_node_ref *node;
struct eth1394_node_info *node_info;
u16 maxpayload;
struct eth1394_node_ref *node;
struct eth1394_node_info *node_info;
+ __be64 guid;
/* Sanity check. MacOSX seems to be sending us 131 in this
* field (atleast on my Panther G5). Not sure why. */
/* Sanity check. MacOSX seems to be sending us 131 in this
* field (atleast on my Panther G5). Not sure why. */
@@
-902,8
+902,9
@@
static inline u16 ether1394_parse_encap(struct sk_buff *skb,
maxpayload = min(eth1394_speedto_maxpayload[sspd], (u16)(1 << (max_rec + 1)));
maxpayload = min(eth1394_speedto_maxpayload[sspd], (u16)(1 << (max_rec + 1)));
+ guid = get_unaligned(&arp1394->s_uniq_id);
node = eth1394_find_node_guid(&priv->ip_node_list,
node = eth1394_find_node_guid(&priv->ip_node_list,
- be64_to_cpu(
arp1394->s_uniq_
id));
+ be64_to_cpu(
gu
id));
if (!node) {
return 0;
}
if (!node) {
return 0;
}
@@
-931,10
+932,9
@@
static inline u16 ether1394_parse_encap(struct sk_buff *skb,
arp_ptr += arp->ar_pln; /* skip over sender IP addr */
if (arp->ar_op == htons(ARPOP_REQUEST))
arp_ptr += arp->ar_pln; /* skip over sender IP addr */
if (arp->ar_op == htons(ARPOP_REQUEST))
- /* just set ARP req target unique ID to 0 */
- *((u64*)arp_ptr) = 0;
+ memset(arp_ptr, 0, sizeof(u64));
else
else
-
*((u64*)arp_ptr) = *((u64*)dev->dev_addr
);
+
memcpy(arp_ptr, dev->dev_addr, sizeof(u64)
);
}
/* Now add the ethernet header. */
}
/* Now add the ethernet header. */
@@
-1675,8
+1675,10
@@
static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF])
priv->bc_dgl++;
} else {
if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF])
priv->bc_dgl++;
} else {
+ __be64 guid = get_unaligned((u64 *)eth->h_dest);
+
node = eth1394_find_node_guid(&priv->ip_node_list,
node = eth1394_find_node_guid(&priv->ip_node_list,
- be64_to_cpu(
*(u64*)eth->h_dest
));
+ be64_to_cpu(
guid
));
if (!node) {
ret = -EAGAIN;
goto fail;
if (!node) {
ret = -EAGAIN;
goto fail;