diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 08:55:04 -0700 |
| commit | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (patch) | |
| tree | 0fb90068b5b19436723d55bc44350776588c2992 /net/core/dev.c | |
| parent | ce9df0b00ac7f0a733d361c23bebdd79f32f8adc (diff) | |
| parent | 469d633d20c774ecd34ac615c838193e1e150c62 (diff) | |
| download | olio-linux-3.10-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.tar.xz olio-linux-3.10-d29778a01d5fc4b69ca1e7bc21121536e5c1c31d.zip | |
Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes-non-critical
Some miscellaneous OMAP hwmod, powerdomain, and clock fixes for 3.10.
Basic test logs are here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_3.10/20130331205716/
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index dffbef70cd3..b13e5c766c1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1545,7 +1545,6 @@ void net_enable_timestamp(void) return; } #endif - WARN_ON(in_interrupt()); static_key_slow_inc(&netstamp_needed); } EXPORT_SYMBOL(net_enable_timestamp); @@ -2219,9 +2218,9 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); struct packet_offload *ptype; __be16 type = skb->protocol; + int vlan_depth = ETH_HLEN; while (type == htons(ETH_P_8021Q)) { - int vlan_depth = ETH_HLEN; struct vlan_hdr *vh; if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN))) |