From: "Enrico Mioso (@atlantide)" <mrkiko.rs@gmail.com>
To: "Bjørn Mork" <bjorn@mork.no>
Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org,
Alexey Orishko <alexey.orishko@gmail.com>,
Oliver Neukum <oliver@neukum.org>,
David Laight <David.Laight@aculab.com>
Subject: Re: [PATCH net-next 11/11] net: cdc_ncm: remove redundant "disconnected" flag
Date: Sun, 11 May 2014 11:14:29 +0200 (CEST) [thread overview]
Message-ID: <alpine.LNX.2.03.1405111113530.1398@gmail.com> (raw)
In-Reply-To: <1399736509-1159-12-git-send-email-bjorn@mork.no>
Acked-By: Enrico Mioso <mrkiko.rs@gmail.com>
On Sat, 10 May 2014, Bj?rn Mork wrote:
==Date: Sat, 10 May 2014 17:41:49 +0200
==From: Bj?rn Mork <bjorn@mork.no>
==To: netdev@vger.kernel.org
==Cc: linux-usb@vger.kernel.org, Alexey Orishko <alexey.orishko@gmail.com>,
== Oliver Neukum <oliver@neukum.org>, Enrico Mioso <mrkiko.rs@gmail.com>,
== David Laight <David.Laight@aculab.com>, Bj?rn Mork <bjorn@mork.no>
==Subject: [PATCH net-next 11/11] net: cdc_ncm: remove redundant "disconnected"
== flag
==
==Calling netif_carrier_{on,off} is sufficient. There is no need
==to duplicate the carrier state in a driver specific flag.
==
==Signed-off-by: Bj?rn Mork <bjorn@mork.no>
==---
== drivers/net/usb/cdc_ncm.c | 19 ++-----------------
== drivers/net/usb/huawei_cdc_ncm.c | 13 -------------
== include/linux/usb/cdc_ncm.h | 1 -
== 3 files changed, 2 insertions(+), 31 deletions(-)
==
==diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
==index c65145671521..114d56b9fe29 100644
==--- a/drivers/net/usb/cdc_ncm.c
==+++ b/drivers/net/usb/cdc_ncm.c
==@@ -1353,11 +1353,10 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
== * USB_CDC_NOTIFY_NETWORK_CONNECTION notification shall be
== * sent by device after USB_CDC_NOTIFY_SPEED_CHANGE.
== */
==- ctx->connected = le16_to_cpu(event->wValue);
== netif_info(dev, link, dev->net,
== "network connection: %sconnected\n",
==- ctx->connected ? "" : "dis");
==- usbnet_link_change(dev, ctx->connected, 0);
==+ !!event->wValue ? "" : "dis");
==+ usbnet_link_change(dev, !!event->wValue, 0);
== break;
==
== case USB_CDC_NOTIFY_SPEED_CHANGE:
==@@ -1377,23 +1376,11 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
== }
== }
==
==-static int cdc_ncm_check_connect(struct usbnet *dev)
==-{
==- struct cdc_ncm_ctx *ctx;
==-
==- ctx = (struct cdc_ncm_ctx *)dev->data[0];
==- if (ctx == NULL)
==- return 1; /* disconnected */
==-
==- return !ctx->connected;
==-}
==-
== static const struct driver_info cdc_ncm_info = {
== .description = "CDC NCM",
== .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==@@ -1407,7 +1394,6 @@ static const struct driver_info wwan_info = {
== | FLAG_WWAN,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==@@ -1421,7 +1407,6 @@ static const struct driver_info wwan_noarp_info = {
== | FLAG_WWAN | FLAG_NOARP,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c
==index 312178d7b698..f9822bc75425 100644
==--- a/drivers/net/usb/huawei_cdc_ncm.c
==+++ b/drivers/net/usb/huawei_cdc_ncm.c
==@@ -172,24 +172,11 @@ err:
== return ret;
== }
==
==-static int huawei_cdc_ncm_check_connect(struct usbnet *usbnet_dev)
==-{
==- struct cdc_ncm_ctx *ctx;
==-
==- ctx = (struct cdc_ncm_ctx *)usbnet_dev->data[0];
==-
==- if (ctx == NULL)
==- return 1; /* disconnected */
==-
==- return !ctx->connected;
==-}
==-
== static const struct driver_info huawei_cdc_ncm_info = {
== .description = "Huawei CDC NCM device",
== .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
== .bind = huawei_cdc_ncm_bind,
== .unbind = huawei_cdc_ncm_unbind,
==- .check_connect = huawei_cdc_ncm_check_connect,
== .manage_power = huawei_cdc_ncm_manage_power,
== .rx_fixup = cdc_ncm_rx_fixup,
== .tx_fixup = cdc_ncm_tx_fixup,
==diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
==index 1921bdadd9ab..dc175b1debdf 100644
==--- a/include/linux/usb/cdc_ncm.h
==+++ b/include/linux/usb/cdc_ncm.h
==@@ -118,7 +118,6 @@ struct cdc_ncm_ctx {
== u16 tx_ndp_modulus;
== u16 tx_seq;
== u16 rx_seq;
==- u16 connected;
== u16 min_tx_pkt;
==
== /* statistics */
==--
==2.0.0.rc2
==
==
prev parent reply other threads:[~2014-05-11 9:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-10 15:41 [PATCH net-next 00/11] cdc_ncm: add buffer tuning and stats using ethtool Bjørn Mork
[not found] ` <1399736509-1159-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
2014-05-10 15:41 ` [PATCH net-next 01/11] net: cdc_ncm: split out rx_max/tx_max update of setup Bjørn Mork
2014-05-13 8:09 ` Oliver Neukum
2014-05-13 8:49 ` Bjørn Mork
2014-05-13 9:09 ` Oliver Neukum
[not found] ` <1399972165.8278.11.camel-B2T3B9s34ElbnMAlSieJcQ@public.gmane.org>
2014-05-13 9:25 ` Bjørn Mork
2014-05-13 11:07 ` Oliver Neukum
2014-05-10 15:41 ` [PATCH net-next 04/11] net: cdc_ncm: support rx_max/tx_max updates when running Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 10/11] net: cdc_ncm: fix argument alignment Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 02/11] net: cdc_ncm: factor out one-time device initialization Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 03/11] net: cdc_ncm: split .bind " Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 05/11] net: cdc_ncm: use ethtool to tune coalescing settings Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 06/11] net: cdc_ncm: use true max dgram count for header estimates Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 07/11] net: cdc_ncm: set reasonable padding limits Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 08/11] net: cdc_ncm/cdc_mbim: adding NCM protocol statiscics Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 09/11] net: cdc_ncm: use sane defaults for rx/tx buffers Bjørn Mork
2014-05-10 15:41 ` [PATCH net-next 11/11] net: cdc_ncm: remove redundant "disconnected" flag Bjørn Mork
2014-05-11 9:14 ` Enrico Mioso (@atlantide) [this message]
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=alpine.LNX.2.03.1405111113530.1398@gmail.com \
--to=mrkiko.rs@gmail.com \
--cc=David.Laight@aculab.com \
--cc=alexey.orishko@gmail.com \
--cc=bjorn@mork.no \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.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).