From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tyo201.gate.nec.co.jp (TYO201.gate.nec.co.jp [210.143.35.51]) by dpdk.org (Postfix) with ESMTP id B7A4F530A for ; Wed, 19 Mar 2014 00:06:45 +0100 (CET) Received: from mailgate3.nec.co.jp ([10.7.69.192]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id s2IN8DnH008181; Wed, 19 Mar 2014 08:08:13 +0900 (JST) Received: from mailsv4.nec.co.jp (imss63.nec.co.jp [10.7.69.158]) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) with ESMTP id s2IN8Df25493; Wed, 19 Mar 2014 08:08:13 +0900 (JST) Received: from mail03.kamome.nec.co.jp (mail03.kamome.nec.co.jp [10.25.43.7]) by mailsv4.nec.co.jp (8.13.8/8.13.4) with ESMTP id s2IN8D3O016988; Wed, 19 Mar 2014 08:08:13 +0900 (JST) Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.145] [10.38.151.145]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-280734; Wed, 19 Mar 2014 08:04:47 +0900 Received: from BPXM14GP.gisp.nec.co.jp ([169.254.1.238]) by BPXC17GP.gisp.nec.co.jp ([10.38.151.145]) with mapi id 14.02.0328.011; Wed, 19 Mar 2014 08:04:46 +0900 From: Hiroshi Shimamoto To: Olivier Matz , "dev@dpdk.org" Thread-Topic: [memnic PATCH v2] linux: fix build with kernel 3.3 Thread-Index: AQHPJAU49d+tHlM5DUyJeZE0iI2Ioprns3wA Date: Tue, 18 Mar 2014 23:04:45 +0000 Message-ID: <7F861DC0615E0C47A872E6F3C5FCDDBD010824FA@BPXM14GP.gisp.nec.co.jp> References: <7F861DC0615E0C47A872E6F3C5FCDDBD0102D166@BPXM14GP.gisp.nec.co.jp> <1391778282-14558-1-git-send-email-olivier.matz@6wind.com> In-Reply-To: <1391778282-14558-1-git-send-email-olivier.matz@6wind.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.205.5.123] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [memnic PATCH v2] linux: fix build with kernel 3.3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Mar 2014 23:06:46 -0000 Hi, I missed it sorry. > Subject: [memnic PATCH v2] linux: fix build with kernel 3.3 >=20 > Remove unused dev_ops functions. >=20 > 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. >=20 > Signed-off-by: Olivier Matz Acked-by: Hiroshi Shimamoto thanks, Hiroshi > --- > linux/memnic_net.c | 33 --------------------------------- > 1 file changed, 33 deletions(-) >=20 > Hi Shimamoto-san, >=20 > 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. >=20 > Let me know if you have any comment. >=20 > Regards, > Olivier >=20 > 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; > } >=20 > -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 *netd= ev, int new_mtu) > return 0; > } >=20 > -static void memnic_tx_timeout(struct net_device *netdev) > -{ > -} > - > -static void memnic_vlan_rx_add_vid(struct net_device *netdev, unsigned s= hort 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, in= t cmd) > -{ > - return 0; > -} > - > static struct net_device_stats *memnic_get_stats(struct net_device *netd= ev) > { > struct memnic_net *memnic =3D netdev_priv(netdev); > @@ -283,15 +256,9 @@ static const struct net_device_ops memnic_netdev_ops= =3D { > .ndo_open =3D memnic_open, > .ndo_stop =3D memnic_close, > .ndo_start_xmit =3D memnic_start_xmit, > - .ndo_select_queue =3D memnic_select_queue, > - .ndo_set_rx_mode =3D memnic_set_rx_mode, > .ndo_validate_addr =3D eth_validate_addr, > .ndo_set_mac_address =3D memnic_set_mac, > .ndo_change_mtu =3D memnic_change_mtu, > - .ndo_tx_timeout =3D memnic_tx_timeout, > - .ndo_vlan_rx_add_vid =3D memnic_vlan_rx_add_vid, > - .ndo_vlan_rx_kill_vid =3D memnic_vlan_rx_kill_vid, > - .ndo_do_ioctl =3D memnic_ioctl, > .ndo_get_stats =3D memnic_get_stats, > }; >=20 > -- > 1.8.5.3