From 5fcba6af748035bb5122f3e55480189a7761ad5e Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 5 Feb 2013 20:22:20 +0000 Subject: [PATCH] --- yaml --- r: 352112 b: refs/heads/master c: 6d1ccff627806829c46091bd9d9835302a3fbf5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a6cf078c8f70..39ec2a57dea5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12b0004d1d1e2a9aa667412d479041e403bcafae +refs/heads/master: 6d1ccff627806829c46091bd9d9835302a3fbf5f diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 65da698c500b..2f31bf97ba65 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2835,6 +2835,8 @@ int dev_queue_xmit(struct sk_buff *skb) struct Qdisc *q; int rc = -ENOMEM; + skb_reset_mac_header(skb); + /* Disable soft irqs for various locks below. Also * stops preemption for RCU. */