From faaebedef73623554b7f2bd848267ff59d0cf697 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 14 Jun 2009 11:46:57 +0200 Subject: [PATCH] --- yaml --- r: 153840 b: refs/heads/master c: 156ce867a6725ea8a24b452469a6dc9f3fa6a161 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/net.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 381c7e386177..2e7955f7f192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a124d382ea5c97be43c779e4f481455e0287654 +refs/heads/master: 156ce867a6725ea8a24b452469a6dc9f3fa6a161 diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c index d83c54587a63..d67e8d957d21 100644 --- a/trunk/drivers/firewire/net.c +++ b/trunk/drivers/firewire/net.c @@ -628,13 +628,8 @@ static int fwnet_finish_incoming_packet(struct net_device *net, skb->pkt_type = PACKET_MULTICAST; #endif } else { - if (memcmp(eth->h_dest, net->dev_addr, net->addr_len)) { - u64 a1, a2; - - memcpy(&a1, eth->h_dest, sizeof(u64)); - memcpy(&a2, net->dev_addr, sizeof(u64)); + if (memcmp(eth->h_dest, net->dev_addr, net->addr_len)) skb->pkt_type = PACKET_OTHERHOST; - } } if (ntohs(eth->h_proto) >= 1536) { protocol = eth->h_proto;