[PATCH net-next 0/6] network related warning fixes

[PATCH net-next 0/6] network related warning fixes

[Stephen Hemminger]

Various fixes for warnings in network code and drivers.

Stephen Hemminger (6):
  bnxt: fix unsigned comparsion with 0
  bnxt: fix unused variable warnings
  benet: fix set but not used warning
  netfilter: remove unused variable
  socket: fix set not used warning
  6lowpan: fix set not used warning

 drivers/net/ethernet/broadcom/bnxt/bnxt.c         | 4 ----
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
 drivers/net/ethernet/emulex/benet/be_roce.c       | 3 ---
 net/bluetooth/6lowpan.c                           | 3 ---
 net/netfilter/xt_recent.c                         | 2 +-
 net/socket.c                                      | 6 ++----
 6 files changed, 4 insertions(+), 16 deletions(-)

-- 
2.11.0

[PATCH net-next 1/6] bnxt: fix unsigned comparsion with 0

[Stephen Hemminger]

Fixes warning because location is u32 and can never be netative
warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index be6acadcb202..96b8c0db10f9 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -520,7 +520,7 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)
 	struct flow_keys *fkeys;
 	int i, rc = -EINVAL;
 
-	if (fs->location < 0 || fs->location >= BNXT_NTP_FLTR_MAX_FLTR)
+	if (fs->location >= BNXT_NTP_FLTR_MAX_FLTR)
 		return rc;
 
 	for (i = 0; i < BNXT_NTP_FLTR_HASH_SIZE; i++) {
-- 
2.11.0

[PATCH net-next 2/6] bnxt: fix unused variable warnings

[Stephen Hemminger]

Fix a couple of warnings where variable ‘txq’ set but not used

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index e7c8539cbddf..54b732de2850 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5559,12 +5559,10 @@ void bnxt_tx_disable(struct bnxt *bp)
 {
 	int i;
 	struct bnxt_tx_ring_info *txr;
-	struct netdev_queue *txq;
 
 	if (bp->tx_ring) {
 		for (i = 0; i < bp->tx_nr_rings; i++) {
 			txr = &bp->tx_ring[i];
-			txq = netdev_get_tx_queue(bp->dev, i);
 			txr->dev_state = BNXT_DEV_STATE_CLOSING;
 		}
 	}
@@ -5577,11 +5575,9 @@ void bnxt_tx_enable(struct bnxt *bp)
 {
 	int i;
 	struct bnxt_tx_ring_info *txr;
-	struct netdev_queue *txq;
 
 	for (i = 0; i < bp->tx_nr_rings; i++) {
 		txr = &bp->tx_ring[i];
-		txq = netdev_get_tx_queue(bp->dev, i);
 		txr->dev_state = 0;
 	}
 	netif_tx_wake_all_queues(bp->dev);
-- 
2.11.0

[PATCH net-next 3/6] benet: fix set but not used warning

[Stephen Hemminger]

warning: variable ‘netdev’ set but not used

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/net/ethernet/emulex/benet/be_roce.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c
index 2b62841c4c63..05989aafaf32 100644
--- a/drivers/net/ethernet/emulex/benet/be_roce.c
+++ b/drivers/net/ethernet/emulex/benet/be_roce.c
@@ -139,10 +139,7 @@ int be_roce_register_driver(struct ocrdma_driver *drv)
 	}
 	ocrdma_drv = drv;
 	list_for_each_entry(dev, &be_adapter_list, entry) {
-		struct net_device *netdev;
-
 		_be_roce_dev_add(dev);
-		netdev = dev->netdev;
 	}
 	mutex_unlock(&be_adapter_list_lock);
 	return 0;
-- 
2.11.0

[PATCH net-next 4/6] netfilter: remove unused variable

[Stephen Hemminger]

warning: ‘recent_old_fops’ defined but not used

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 net/netfilter/xt_recent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 3f6c4fa78bdb..245fa350a7a8 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -106,7 +106,7 @@ static DEFINE_SPINLOCK(recent_lock);
 static DEFINE_MUTEX(recent_mutex);
 
 #ifdef CONFIG_PROC_FS
-static const struct file_operations recent_old_fops, recent_mt_fops;
+static const struct file_operations recent_mt_fops;
 #endif
 
 static u_int32_t hash_rnd __read_mostly;
-- 
2.11.0

[PATCH net-next 5/6] socket: fix set not used warning

[Stephen Hemminger]

The variable owned_by_user is always set, but only used
when kernel is configured with LOCKDEP enabled.

Get rid of the warning by moving the code to put the call
to owned_by_user into the the rcu_protected call.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 net/socket.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index bf2122691fba..79d9bb964cd8 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -3404,7 +3404,6 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
 	struct inet_sock *inet;
 	struct ip_options_rcu *opt;
 	u32 overhead = 0;
-	bool owned_by_user;
 #if IS_ENABLED(CONFIG_IPV6)
 	struct ipv6_pinfo *np;
 	struct ipv6_txoptions *optv6 = NULL;
@@ -3413,13 +3412,12 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
 	if (!sk)
 		return overhead;
 
-	owned_by_user = sock_owned_by_user(sk);
 	switch (sk->sk_family) {
 	case AF_INET:
 		inet = inet_sk(sk);
 		overhead += sizeof(struct iphdr);
 		opt = rcu_dereference_protected(inet->inet_opt,
-						owned_by_user);
+						sock_owned_by_user(sk));
 		if (opt)
 			overhead += opt->opt.optlen;
 		return overhead;
@@ -3429,7 +3427,7 @@ u32 kernel_sock_ip_overhead(struct sock *sk)
 		overhead += sizeof(struct ipv6hdr);
 		if (np)
 			optv6 = rcu_dereference_protected(np->opt,
-							  owned_by_user);
+							  sock_owned_by_user(sk));
 		if (optv6)
 			overhead += (optv6->opt_flen + optv6->opt_nflen);
 		return overhead;
-- 
2.11.0

[PATCH net-next 6/6] 6lowpan: fix set not used warning

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 net/bluetooth/6lowpan.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 2af4f1cc0ab4..4e2576fc0c59 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -273,9 +273,6 @@ static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
 			   struct lowpan_peer *peer)
 {
 	const u8 *saddr;
-	struct lowpan_btle_dev *dev;
-
-	dev = lowpan_btle_dev(netdev);
 
 	saddr = peer->lladdr;
 
-- 
2.11.0

Re: [PATCH net-next 1/6] bnxt: fix unsigned comparsion with 0

[Michael Chan]

On Mon, Jul 24, 2017 at 10:25 AM, Stephen Hemminger
<stephen@networkplumber.org> wrote:
> Fixes warning because location is u32 and can never be netative
> warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
>
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>

Acked-by: Michael Chan <michael.chan@broadcom.com>

Re: [PATCH net-next 2/6] bnxt: fix unused variable warnings

[Michael Chan]

On Mon, Jul 24, 2017 at 10:25 AM, Stephen Hemminger
<stephen@networkplumber.org> wrote:
> Fix a couple of warnings where variable ‘txq’ set but not used
>
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>

Acked-by: Michael Chan <michael.chan@broadcom.com>v, i);

Re: [PATCH net-next 2/6] bnxt: fix unused variable warnings

[Michael Chan]

On Mon, Jul 24, 2017 at 10:25 AM, Stephen Hemminger
<stephen@networkplumber.org> wrote:
> Fix a couple of warnings where variable =E2=80=98txq=E2=80=99 set but not=
 used
>
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>

Acked-by: Michael Chan <michael.chan@broadcom.com>v, i);

Re: [PATCH net-next 6/6] 6lowpan: fix set not used warning

[Luiz Augusto von Dentz]

Hi Stephen,

On Mon, Jul 24, 2017 at 8:25 PM, Stephen Hemminger
<stephen@networkplumber.org> wrote:
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
> ---
>  net/bluetooth/6lowpan.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
> index 2af4f1cc0ab4..4e2576fc0c59 100644
> --- a/net/bluetooth/6lowpan.c
> +++ b/net/bluetooth/6lowpan.c
> @@ -273,9 +273,6 @@ static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
>                            struct lowpan_peer *peer)
>  {
>         const u8 *saddr;
> -       struct lowpan_btle_dev *dev;
> -
> -       dev = lowpan_btle_dev(netdev);
>
>         saddr = peer->lladdr;
>
> --
> 2.11.0

Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

-- 
Luiz Augusto von Dentz

Re: [PATCH net-next 0/6] network related warning fixes

[David Miller]

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 24 Jul 2017 10:25:17 -0700

> Various fixes for warnings in network code and drivers.

Series applied, thanks Stephen.