DPDK patches and discussions
 help / color / mirror / Atom feed
From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [memnic PATCH v2] linux: fix build with kernel 3.3
Date: Fri,  7 Feb 2014 14:04:42 +0100	[thread overview]
Message-ID: <1391778282-14558-1-git-send-email-olivier.matz@6wind.com> (raw)
In-Reply-To: <7F861DC0615E0C47A872E6F3C5FCDDBD0102D166@BPXM14GP.gisp.nec.co.jp>

Remove unused dev_ops functions.

The API of some functions (memnic_vlan_rx_add_vid,
memnic_vlan_rx_kill_vid) changed starting from 3.3 kernel. Instead of
using a #ifdef to handle the compilation on any kernel, we can just
remove these functions as they are not needed.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 linux/memnic_net.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

Hi Shimamoto-san,

Here is a new version of the patch, I think we don't need the following
functions so we can just remove them instead of keeping several dummy
functions for different kernel versions.

Let me know if you have any comment.

Regards,
Olivier

diff --git a/linux/memnic_net.c b/linux/memnic_net.c
index 747ae51..9019258 100644
--- a/linux/memnic_net.c
+++ b/linux/memnic_net.c
@@ -235,16 +235,6 @@ drop:
 	return NETDEV_TX_OK;
 }
 
-static u16 memnic_select_queue(struct net_device *netdev,
-				struct sk_buff *skb)
-{
-	return 0;
-}
-
-static void memnic_set_rx_mode(struct net_device *netdev)
-{
-}
-
 static int memnic_set_mac(struct net_device *netdev, void *p)
 {
 	return 0;
@@ -255,23 +245,6 @@ static int memnic_change_mtu(struct net_device *netdev, int new_mtu)
 	return 0;
 }
 
-static void memnic_tx_timeout(struct net_device *netdev)
-{
-}
-
-static void memnic_vlan_rx_add_vid(struct net_device *netdev, unsigned short vid)
-{
-}
-
-static void memnic_vlan_rx_kill_vid(struct net_device *netdev, unsigned short vid)
-{
-}
-
-static int memnic_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
-{
-	return 0;
-}
-
 static struct net_device_stats *memnic_get_stats(struct net_device *netdev)
 {
 	struct memnic_net *memnic = netdev_priv(netdev);
@@ -283,15 +256,9 @@ static const struct net_device_ops memnic_netdev_ops = {
 	.ndo_open		= memnic_open,
 	.ndo_stop		= memnic_close,
 	.ndo_start_xmit		= memnic_start_xmit,
-	.ndo_select_queue	= memnic_select_queue,
-	.ndo_set_rx_mode	= memnic_set_rx_mode,
 	.ndo_validate_addr	= eth_validate_addr,
 	.ndo_set_mac_address	= memnic_set_mac,
 	.ndo_change_mtu		= memnic_change_mtu,
-	.ndo_tx_timeout		= memnic_tx_timeout,
-	.ndo_vlan_rx_add_vid	= memnic_vlan_rx_add_vid,
-	.ndo_vlan_rx_kill_vid	= memnic_vlan_rx_kill_vid,
-	.ndo_do_ioctl		= memnic_ioctl,
 	.ndo_get_stats		= memnic_get_stats,
 };
 
-- 
1.8.5.3

  reply	other threads:[~2014-02-07 13:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-24 15:59 [dpdk-dev] [memnic PATCH] linux: fix build with kernel >= 3.3 Olivier Matz
2014-01-30 11:46 ` Hiroshi Shimamoto
2014-02-07 13:04   ` Olivier Matz [this message]
2014-03-18 23:04     ` [dpdk-dev] [memnic PATCH v2] linux: fix build with kernel 3.3 Hiroshi Shimamoto
2014-03-21 14:59       ` Thomas Monjalon

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=1391778282-14558-1-git-send-email-olivier.matz@6wind.com \
    --to=olivier.matz@6wind.com \
    --cc=dev@dpdk.org \
    /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;
as well as URLs for NNTP newsgroup(s).