lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20100913123745.e4a4df44.sfr@canb.auug.org.au> Date: Mon, 13 Sep 2010 12:37:45 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Koki Sanagi <sanagi.koki@...fujitsu.com>, Frederic Weisbecker <fweisbec@...il.com>, Changli Gao <xiaosuo@...il.com>, David Miller <davem@...emloft.net>, <netdev@...r.kernel.org> Subject: linux-next: manual merge of the tip tree with the net tree Hi all, Today's linux-next merge of the tip tree got a conflict in net/core/dev.c between commit 05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q: make vlan_hwaccel_do_receive() return void") from the net tree and commit cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add tracepoints to netdev layer") from the tip tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc net/core/dev.c index fc2dc93,2308cce..0000000 --- a/net/core/dev.c +++ b/net/core/dev.c @@@ -2847,8 -2835,9 +2854,9 @@@ static int __netif_receive_skb(struct s if (!netdev_tstamp_prequeue) net_timestamp_check(skb); + trace_netif_receive_skb(skb); - if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb)) - return NET_RX_SUCCESS; + if (vlan_tx_tag_present(skb)) + vlan_hwaccel_do_receive(skb); /* if we've gotten here through NAPI, check netpoll */ if (netpoll_receive_skb(skb)) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists