Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 97943
b: refs/heads/master
c: 23cde76
h: refs/heads/master
i:
  97941: be32552
  97939: c799c6a
  97935: 023f001
v: v3
  • Loading branch information
Mark McLoughlin authored and Jeff Garzik committed Jun 10, 2008
1 parent 265771e commit 690a2dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00aaea2f95d73d4e2b5e45cf77c3cbb16c59e87f
refs/heads/master: 23cde76d801246a702e7a84c3fe3d655b35c89a1
8 changes: 5 additions & 3 deletions trunk/drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb,
BUG_ON(len > MAX_PACKET_LEN);

skb_trim(skb, len);
skb->protocol = eth_type_trans(skb, dev);
pr_debug("Receiving skb proto 0x%04x len %i type %i\n",
ntohs(skb->protocol), skb->len, skb->pkt_type);

dev->stats.rx_bytes += skb->len;
dev->stats.rx_packets++;

Expand All @@ -106,6 +104,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb,
goto frame_err;
}

skb->protocol = eth_type_trans(skb, dev);
pr_debug("Receiving skb proto 0x%04x len %i type %i\n",
ntohs(skb->protocol), skb->len, skb->pkt_type);

if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
pr_debug("GSO!\n");
switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {
Expand Down

0 comments on commit 690a2dc

Please sign in to comment.