aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/eth1394.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 33b80817d68c..b31f90082e35 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -162,7 +162,8 @@ static int ether1394_header(struct sk_buff *skb, struct net_device *dev,
162 unsigned short type, void *daddr, void *saddr, 162 unsigned short type, void *daddr, void *saddr,
163 unsigned len); 163 unsigned len);
164static int ether1394_rebuild_header(struct sk_buff *skb); 164static int ether1394_rebuild_header(struct sk_buff *skb);
165static int ether1394_header_parse(struct sk_buff *skb, unsigned char *haddr); 165static int ether1394_header_parse(const struct sk_buff *skb,
166 unsigned char *haddr);
166static int ether1394_header_cache(struct neighbour *neigh, struct hh_cache *hh); 167static int ether1394_header_cache(struct neighbour *neigh, struct hh_cache *hh);
167static void ether1394_header_cache_update(struct hh_cache *hh, 168static void ether1394_header_cache_update(struct hh_cache *hh,
168 struct net_device *dev, 169 struct net_device *dev,
@@ -751,11 +752,10 @@ static int ether1394_rebuild_header(struct sk_buff *skb)
751 return 0; 752 return 0;
752} 753}
753 754
754static int ether1394_header_parse(struct sk_buff *skb, unsigned char *haddr) 755static int ether1394_header_parse(const struct sk_buff *skb,
756 unsigned char *haddr)
755{ 757{
756 struct net_device *dev = skb->dev; 758 memcpy(haddr, skb->dev->dev_addr, ETH1394_ALEN);
757
758 memcpy(haddr, dev->dev_addr, ETH1394_ALEN);
759 return ETH1394_ALEN; 759 return ETH1394_ALEN;
760} 760}
761 761