diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 06:34:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 06:34:27 -0400 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /drivers/net/xen-netfront.c | |
| parent | 2b3942e4bb20ef8ef26515bd958c2df83d9a6210 (diff) | |
| parent | 96b3d28bf4b00f62fc8386ff5d487d1830793a3d (diff) | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index f9daa9e183f2..e30d80033cbc 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -907,6 +907,7 @@ static int handle_incoming_queue(struct net_device *dev, | |||
| 907 | 907 | ||
| 908 | /* Ethernet work: Delayed to here as it peeks the header. */ | 908 | /* Ethernet work: Delayed to here as it peeks the header. */ |
| 909 | skb->protocol = eth_type_trans(skb, dev); | 909 | skb->protocol = eth_type_trans(skb, dev); |
| 910 | skb_reset_network_header(skb); | ||
| 910 | 911 | ||
| 911 | if (checksum_setup(dev, skb)) { | 912 | if (checksum_setup(dev, skb)) { |
| 912 | kfree_skb(skb); | 913 | kfree_skb(skb); |