diff --git a/[refs] b/[refs] index e8b576159986..72881126f09c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fbc5b20e2715997a1b5e634543e8cac9aa36d4c +refs/heads/master: b577d7e2ad50cfbf43b648e34128a5c231cc5236 diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c index e7a711f53a6f..df6a1caea7b6 100644 --- a/trunk/drivers/firewire/net.c +++ b/trunk/drivers/firewire/net.c @@ -520,7 +520,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net, dev = netdev_priv(net); /* Write metadata, and then pass to the receive level */ skb->dev = net; - skb->ip_summed = CHECKSUM_UNNECESSARY; /* don't check it */ + skb->ip_summed = CHECKSUM_NONE; /* * Parse the encapsulation header. This actually does the job of