projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph
[powerpc.git]
/
drivers
/
ieee1394
/
eth1394.c
diff --git
a/drivers/ieee1394/eth1394.c
b/drivers/ieee1394/eth1394.c
index
97e5c3d
..
a364003
100644
(file)
--- a/
drivers/ieee1394/eth1394.c
+++ b/
drivers/ieee1394/eth1394.c
@@
-43,7
+43,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/errno.h>
@@
-585,7
+584,10
@@
static void ether1394_add_host (struct hpsb_host *host)
}
SET_MODULE_OWNER(dev);
}
SET_MODULE_OWNER(dev);
+#if 0
+ /* FIXME - Is this the correct parent device anyway? */
SET_NETDEV_DEV(dev, &host->device);
SET_NETDEV_DEV(dev, &host->device);
+#endif
priv = netdev_priv(dev);
priv = netdev_priv(dev);
@@
-832,7
+834,7
@@
static inline u16 ether1394_type_trans(struct sk_buff *skb,
struct eth1394hdr *eth;
unsigned char *rawp;
struct eth1394hdr *eth;
unsigned char *rawp;
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb_pull (skb, ETH1394_HLEN);
eth = eth1394_hdr(skb);
skb_pull (skb, ETH1394_HLEN);
eth = eth1394_hdr(skb);
@@
-1666,7
+1668,7
@@
static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
if (memcmp(eth->h_dest, dev->broadcast, ETH1394_ALEN) == 0 ||
proto == htons(ETH_P_ARP) ||
(proto == htons(ETH_P_IP) &&
if (memcmp(eth->h_dest, dev->broadcast, ETH1394_ALEN) == 0 ||
proto == htons(ETH_P_ARP) ||
(proto == htons(ETH_P_IP) &&
- IN_MULTICAST(ntohl(
skb->nh.iph
->daddr)))) {
+ IN_MULTICAST(ntohl(
ip_hdr(skb)
->daddr)))) {
tx_type = ETH1394_GASP;
dest_node = LOCAL_BUS | ALL_NODES;
max_payload = priv->bc_maxpayload - ETHER1394_GASP_OVERHEAD;
tx_type = ETH1394_GASP;
dest_node = LOCAL_BUS | ALL_NODES;
max_payload = priv->bc_maxpayload - ETHER1394_GASP_OVERHEAD;