From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Subject: [PATCH 02/10] backports: add napi_gro_flush()
Date: Fri, 11 Apr 2014 18:34:27 -0700 [thread overview]
Message-ID: <1397266475-14442-3-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1397266475-14442-1-git-send-email-mcgrof@do-not-panic.com>
From: Johannes Berg <johannes.berg@intel.com>
napi_gro_flush() got a second argument in kernel 3.7, but it
can be ignored for prior kernel versions.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
backport/backport-include/linux/netdevice.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index f77e3eb..a39bff7 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -521,6 +521,7 @@ struct net *dev_net(const struct net_device *dev)
#define netdev_notify_peers(dev)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
#define netdev_notify_peers(dev) netif_notify_peers(dev)
+#define napi_gro_flush(napi, old) napi_gro_flush(napi)
#endif
#endif /* __BACKPORT_NETDEVICE_H */
--
1.9.1
next prev parent reply other threads:[~2014-04-12 1:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-12 1:34 [PATCH 00/10] backports: catch up to next-20140411 Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 01/10] backports: add hwsim defconfig Luis R. Rodriguez
2014-04-12 1:34 ` Luis R. Rodriguez [this message]
2014-04-12 1:34 ` [PATCH 03/10] backports: device: don't redefine DEVICE_ATTR_RO Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 04/10] backports: drop display output class support Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 05/10] backports: adjust flow_dissector.patch Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 06/10] backports: backport dev_consume_skb_any() Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 07/10] backports: backport define of SIOCGHWTSTAMP Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 08/10] backports: bump bluetooth reqs to 3.2 Luis R. Rodriguez
2014-04-12 1:41 ` Luis R. Rodriguez
2014-04-12 3:27 ` Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 09/10] backports: nuke support for kernels < 3.0 Luis R. Rodriguez
2014-04-12 1:34 ` [PATCH 10/10] backports: refresh patches for next-20140409 and next-20140411 Luis R. Rodriguez
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=1397266475-14442-3-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=backports@vger.kernel.org \
--cc=emmanuel.grumbach@intel.com \
--cc=johannes.berg@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox