From 75d1900678e048506b091a4f48ceeab75ea539dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Mon, 25 Mar 2013 08:26:08 +0000 Subject: [PATCH] --- yaml --- r: 368674 b: refs/heads/master c: 61a7839a19c157d11930fe69697a4c90884bf7c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/net.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 5b70169d614a..1567fa001ca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 382c4b4090b7394d079c199ba053a378c6cd45b8 +refs/heads/master: 61a7839a19c157d11930fe69697a4c90884bf7c4 diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c index 72536e7fe95c..cb8aa865ff88 100644 --- a/trunk/drivers/firewire/net.c +++ b/trunk/drivers/firewire/net.c @@ -552,8 +552,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net, unsigned char *arp_ptr; u64 fifo_addr; u64 peer_guid; - unsigned sspd; - u16 max_payload; struct fwnet_peer *peer; unsigned long flags; @@ -564,24 +562,10 @@ static int fwnet_finish_incoming_packet(struct net_device *net, fifo_addr = (u64)get_unaligned_be16(&arp1394->fifo_hi) << 32 | get_unaligned_be32(&arp1394->fifo_lo); - sspd = arp1394->sspd; - /* Sanity check. OS X 10.3 PPC reportedly sends 131. */ - if (sspd > SCODE_3200) { - dev_notice(&net->dev, "sspd %x out of range\n", sspd); - sspd = SCODE_3200; - } - max_payload = fwnet_max_payload(arp1394->max_rec, sspd); - spin_lock_irqsave(&dev->lock, flags); peer = fwnet_peer_find_by_guid(dev, peer_guid); if (peer) { peer->fifo = fifo_addr; - - if (peer->speed > sspd) - peer->speed = sspd; - if (peer->max_payload > max_payload) - peer->max_payload = max_payload; - peer->ip = arp1394->sip; } spin_unlock_irqrestore(&dev->lock, flags);