Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / drivers / firewire / net.c

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 512492a122df7f3dbe944da981e0dc5d569e65ce..03a7a85d0424895e9e73301b36637e9848f70d69 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -262,16 +262,16 @@ static int fwnet_header_rebuild(struct sk_buff *skb)
 }
 
 static int fwnet_header_cache(const struct neighbour *neigh,
-                             struct hh_cache *hh)
+                             struct hh_cache *hh, __be16 type)
 {
        struct net_device *net;
        struct fwnet_header *h;
 
-       if (hh->hh_type == cpu_to_be16(ETH_P_802_3))
+       if (type == cpu_to_be16(ETH_P_802_3))
                return -1;
        net = neigh->dev;
        h = (struct fwnet_header *)((u8 *)hh->hh_data + 16 - sizeof(*h));
-       h->h_proto = hh->hh_type;
+       h->h_proto = type;
        memcpy(h->h_dest, neigh->ha, net->addr_len);
        hh->hh_len = FWNET_HLEN;