From: Stephen Rothwell <sfr@au1.ibm.com> To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Koki Sanagi <sanagi.koki@jp.fujitsu.com>, Frederic Weisbecker <fweisbec@gmail.com>, Jesse Gross <jesse@nicira.com> Subject: linux-next: manual merge of the net tree with Linus' tree Date: Fri, 22 Oct 2010 12:19:43 +1100 [thread overview] Message-ID: <20101022121943.120aa4f2.sfr@au1.ibm.com> (raw) Hi all, Today's linux-next merge of the net tree got a conflict in net/core/dev.c between commit cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add tracepoints to netdev layer") from Linus' tree and commits 05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q: make vlan_hwaccel_do_receive() return void") and 3701e51382a026cba10c60b03efabe534fba4ca4 ("vlan: Centralize handling of hardware acceleration") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/core/dev.c index 154e25e,6d4218c..0000000 --- a/net/core/dev.c +++ b/net/core/dev.c @@@ -128,9 -128,8 +128,10 @@@ #include <linux/jhash.h> #include <linux/random.h> #include <trace/events/napi.h> +#include <trace/events/net.h> +#include <trace/events/skb.h> #include <linux/pci.h> + #include <linux/inetdevice.h> #include "net-sysfs.h" @@@ -2835,10 -2898,6 +2905,8 @@@ 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 we've gotten here through NAPI, check netpoll */ if (netpoll_receive_skb(skb)) return NET_RX_DROP;
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@au1.ibm.com> To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Koki Sanagi <sanagi.koki@jp.fujitsu.com>, Frederic Weisbecker <fweisbec@gmail.com>, Jesse Gross <jesse@nicira.com> Subject: linux-next: manual merge of the net tree with Linus' tree Date: Fri, 22 Oct 2010 12:19:43 +1100 [thread overview] Message-ID: <20101022121943.120aa4f2.sfr@au1.ibm.com> (raw) Hi all, Today's linux-next merge of the net tree got a conflict in net/core/dev.c between commit cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add tracepoints to netdev layer") from Linus' tree and commits 05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q: make vlan_hwaccel_do_receive() return void") and 3701e51382a026cba10c60b03efabe534fba4ca4 ("vlan: Centralize handling of hardware acceleration") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/core/dev.c index 154e25e,6d4218c..0000000 --- a/net/core/dev.c +++ b/net/core/dev.c @@@ -128,9 -128,8 +128,10 @@@ #include <linux/jhash.h> #include <linux/random.h> #include <trace/events/napi.h> +#include <trace/events/net.h> +#include <trace/events/skb.h> #include <linux/pci.h> + #include <linux/inetdevice.h> #include "net-sysfs.h" @@@ -2835,10 -2898,6 +2905,8 @@@ 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 we've gotten here through NAPI, check netpoll */ if (netpoll_receive_skb(skb)) return NET_RX_DROP;
next reply other threads:[~2010-10-22 1:19 UTC|newest] Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-10-22 1:19 Stephen Rothwell [this message] 2010-10-22 1:19 ` linux-next: manual merge of the net tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2022-12-07 21:23 Stephen Rothwell 2022-12-08 6:17 ` Juergen Gross 2021-03-18 21:29 Stephen Rothwell 2021-03-19 15:55 ` Leon Romanovsky 2021-03-20 19:28 ` Marc Kleine-Budde 2021-03-20 19:42 ` Linus Torvalds 2021-03-21 9:14 ` Leon Romanovsky 2020-06-09 23:30 Stephen Rothwell 2020-06-09 23:58 ` Arjun Roy 2019-11-19 21:07 Stephen Rothwell 2019-07-21 23:41 Stephen Rothwell 2018-06-28 22:14 Stephen Rothwell 2017-11-26 22:42 Stephen Rothwell 2016-10-15 21:13 Stephen Rothwell 2016-10-17 11:41 ` Mintz, Yuval 2011-09-22 5:16 Stephen Rothwell 2011-09-22 5:16 ` Stephen Rothwell 2011-09-19 4:51 Stephen Rothwell 2011-09-19 4:51 ` Stephen Rothwell 2011-09-19 6:55 ` Dmitry Kravkov 2011-09-19 15:54 ` Joe Perches 2011-09-19 16:04 ` Dmitry Kravkov 2011-09-19 4:41 Stephen Rothwell 2011-09-19 4:41 ` Stephen Rothwell 2011-07-18 4:41 Stephen Rothwell 2011-07-18 4:41 ` Stephen Rothwell 2011-07-18 19:33 ` David Miller 2011-04-08 3:45 Stephen Rothwell 2011-04-08 3:45 ` Stephen Rothwell 2011-04-08 3:49 ` David Miller 2010-12-26 23:41 Stephen Rothwell 2010-12-26 23:41 ` Stephen Rothwell 2010-12-27 2:21 ` David Miller 2010-07-21 2:04 Stephen Rothwell 2010-07-21 2:04 ` Stephen Rothwell 2010-07-21 2:04 ` Stephen Rothwell 2010-07-21 2:31 ` Herbert Xu 2010-07-21 2:31 ` Herbert Xu 2010-07-21 3:27 ` David Miller 2010-07-21 3:27 ` David Miller 2010-07-21 3:44 ` Stephen Rothwell 2010-07-21 3:44 ` Stephen Rothwell 2010-05-17 2:09 Stephen Rothwell 2010-05-17 2:09 ` Stephen Rothwell 2010-05-17 5:28 ` David Miller 2010-05-17 6:24 ` Stephen Rothwell 2010-05-12 2:26 Stephen Rothwell 2010-05-12 2:26 ` Stephen Rothwell 2010-04-27 1:28 Stephen Rothwell 2010-04-27 1:28 ` Stephen Rothwell 2010-04-27 1:28 Stephen Rothwell 2010-04-27 1:28 ` Stephen Rothwell 2010-04-28 0:05 ` David Miller 2010-04-28 0:47 ` Stephen Rothwell 2010-04-14 1:45 Stephen Rothwell 2010-04-14 1:45 ` Stephen Rothwell 2010-04-14 1:47 ` David Miller 2010-04-14 1:52 ` Stephen Rothwell 2010-04-14 2:00 ` David Miller 2010-04-09 0:41 Stephen Rothwell 2010-04-09 0:41 ` Stephen Rothwell 2010-04-07 2:58 Stephen Rothwell 2010-04-07 2:58 ` Stephen Rothwell 2010-04-07 2:58 Stephen Rothwell 2010-04-07 2:58 ` Stephen Rothwell 2010-04-07 3:20 ` Cong Wang 2010-04-07 5:28 ` Stephen Rothwell 2010-03-01 3:20 Stephen Rothwell 2010-03-01 3:20 ` Stephen Rothwell 2010-03-01 3:21 ` David Miller 2010-01-11 2:31 Stephen Rothwell 2010-01-11 2:31 ` Stephen Rothwell 2010-01-11 6:50 ` David Miller 2010-01-11 7:56 ` Stephen Rothwell 2010-01-11 7:59 ` David Miller 2010-01-11 8:49 ` Stephen Rothwell 2009-09-02 3:37 Stephen Rothwell 2009-09-02 7:33 ` David Miller 2009-09-02 8:52 ` Stephen Rothwell 2009-08-07 1:58 Stephen Rothwell 2009-06-03 2:20 Stephen Rothwell 2009-06-03 10:33 ` David Miller 2009-05-19 3:39 Stephen Rothwell 2009-05-19 4:09 ` David Miller 2009-05-19 4:43 ` Stephen Rothwell 2009-02-26 2:48 Stephen Rothwell 2009-02-27 7:17 ` David Miller 2009-02-02 3:13 Stephen Rothwell 2009-02-03 7:51 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20101022121943.120aa4f2.sfr@au1.ibm.com \ --to=sfr@au1.ibm.com \ --cc=davem@davemloft.net \ --cc=fweisbec@gmail.com \ --cc=jesse@nicira.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sanagi.koki@jp.fujitsu.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.