* [PATCH 33/42] irda: irlap_event: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'ret' is set but unused in irlap_state_sclose().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/irda/irlap_event.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index bb47021..ccd214f 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -2227,8 +2227,6 @@ static int irlap_state_nrm_s(struct irlap_cb *self, IRLAP_EVENT event,
static int irlap_state_sclose(struct irlap_cb *self, IRLAP_EVENT event,
struct sk_buff *skb, struct irlap_info *info)
{
- int ret = 0;
-
IRDA_DEBUG(1, "%s()\n", __func__);
IRDA_ASSERT(self != NULL, return -ENODEV;);
@@ -2289,7 +2287,6 @@ static int irlap_state_sclose(struct irlap_cb *self, IRLAP_EVENT event,
IRDA_DEBUG(1, "%s(), Unknown event %d, (%s)\n", __func__,
event, irlap_event[event]);
- ret = -EINVAL;
break;
}
--
1.7.4.3
^ permalink raw reply related
* [PATCH 34/42] irda: irproc: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'd' is set but unused in irda_proc_register().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/irda/irproc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/irda/irproc.c b/net/irda/irproc.c
index 318766e..b9ac598 100644
--- a/net/irda/irproc.c
+++ b/net/irda/irproc.c
@@ -65,15 +65,14 @@ static const struct irda_entry irda_dirs[] = {
void __init irda_proc_register(void)
{
int i;
- struct proc_dir_entry *d;
proc_irda = proc_mkdir("irda", init_net.proc_net);
if (proc_irda == NULL)
return;
for (i = 0; i < ARRAY_SIZE(irda_dirs); i++)
- d = proc_create(irda_dirs[i].name, 0, proc_irda,
- irda_dirs[i].fops);
+ (void) proc_create(irda_dirs[i].name, 0, proc_irda,
+ irda_dirs[i].fops);
}
/*
--
1.7.4.3
^ permalink raw reply related
* [PATCH 35/42] l2tp: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'ret' is set but unused in l2tp_nl_register_ops().
This was obviously meant to maintain error codes which are
returned to the caller, make it so.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/l2tp/l2tp_netlink.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 4c1e540..93a41a0 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -795,11 +795,12 @@ int l2tp_nl_register_ops(enum l2tp_pwtype pw_type, const struct l2tp_nl_cmd_ops
goto out;
l2tp_nl_cmd_ops[pw_type] = ops;
+ ret = 0;
out:
genl_unlock();
err:
- return 0;
+ return ret;
}
EXPORT_SYMBOL_GPL(l2tp_nl_register_ops);
--
1.7.4.3
^ permalink raw reply related
* [PATCH 36/42] netlabel: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'type_str' is set but unused in netlbl_cipsov4_add().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/netlabel/netlabel_cipso_v4.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 5f14c84..bae5756 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -422,7 +422,6 @@ static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
{
int ret_val = -EINVAL;
- const char *type_str = "(unknown)";
struct netlbl_audit audit_info;
if (!info->attrs[NLBL_CIPSOV4_A_DOI] ||
@@ -432,15 +431,12 @@ static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
netlbl_netlink_auditinfo(skb, &audit_info);
switch (nla_get_u32(info->attrs[NLBL_CIPSOV4_A_MTYPE])) {
case CIPSO_V4_MAP_TRANS:
- type_str = "trans";
ret_val = netlbl_cipsov4_add_std(info, &audit_info);
break;
case CIPSO_V4_MAP_PASS:
- type_str = "pass";
ret_val = netlbl_cipsov4_add_pass(info, &audit_info);
break;
case CIPSO_V4_MAP_LOCAL:
- type_str = "local";
ret_val = netlbl_cipsov4_add_local(info, &audit_info);
break;
}
--
1.7.4.3
^ permalink raw reply related
* [PATCH 37/42] netfilter: nfnetlink_log: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'tmp_uint' is set but unused in __build_packet_message().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/netfilter/nfnetlink_log.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 985e9b7..e0ee010 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -381,7 +381,6 @@ __build_packet_message(struct nfulnl_instance *inst,
struct nfulnl_msg_packet_hdr pmsg;
struct nlmsghdr *nlh;
struct nfgenmsg *nfmsg;
- __be32 tmp_uint;
sk_buff_data_t old_tail = inst->skb->tail;
nlh = NLMSG_PUT(inst->skb, 0, 0,
@@ -428,7 +427,6 @@ __build_packet_message(struct nfulnl_instance *inst,
}
if (outdev) {
- tmp_uint = htonl(outdev->ifindex);
#ifndef CONFIG_BRIDGE_NETFILTER
NLA_PUT_BE32(inst->skb, NFULA_IFINDEX_OUTDEV,
htonl(outdev->ifindex));
--
1.7.4.3
^ permalink raw reply related
* [PATCH 38/42] netfilter: nf_conntrack_standalone: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'ret' is set but unused in ct_seq_show().
This was obviously meant to be used to propagate error codes
to the caller, so make it so.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/netfilter/nf_conntrack_standalone.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 0ae1428..05e9feb 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -245,7 +245,7 @@ static int ct_seq_show(struct seq_file *s, void *v)
ret = 0;
release:
nf_ct_put(ct);
- return 0;
+ return ret;
}
static const struct seq_operations ct_seq_ops = {
--
1.7.4.3
^ permalink raw reply related
* [PATCH 39/42] netfilter: ip6_tables: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'target' is set but unused in compat_copy_entry_from_user().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv6/netfilter/ip6_tables.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 5a1c6f2..4c1492f 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1578,7 +1578,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
struct xt_table_info *newinfo, unsigned char *base)
{
struct xt_entry_target *t;
- struct xt_target *target;
struct ip6t_entry *de;
unsigned int origsize;
int ret, h;
@@ -1600,7 +1599,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
}
de->target_offset = e->target_offset - (origsize - *size);
t = compat_ip6t_get_target(e);
- target = t->u.kernel.target;
xt_compat_target_from_user(t, dstptr, size);
de->next_offset = e->next_offset - (origsize - *size);
--
1.7.4.3
^ permalink raw reply related
* [PATCH 40/42] netfilter: ip6table_mangle: Fix set-but-unused variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'flowlabel' is set but unused in ip6t_mangle_out().
The intention here was to compare this key to the header value after
mangling, and trigger a route lookup on mismatch.
Make it so.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv6/netfilter/ip6table_mangle.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index 679a0a3..00d1917 100644
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -64,7 +64,8 @@ ip6t_mangle_out(struct sk_buff *skb, const struct net_device *out)
(memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr)) ||
memcmp(&ipv6_hdr(skb)->daddr, &daddr, sizeof(daddr)) ||
skb->mark != mark ||
- ipv6_hdr(skb)->hop_limit != hop_limit))
+ ipv6_hdr(skb)->hop_limit != hop_limit ||
+ flowlabel != *((u_int32_t *)ipv6_hdr(skb))))
return ip6_route_me_harder(skb) == 0 ? ret : NF_DROP;
return ret;
--
1.7.4.3
^ permalink raw reply related
* [PATCH 41/42] isdn: i4l: isdn_tty: Fix unused-but-set variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variable 'fcr' is set but not used in isdn_tty_change_speed().
Just kill it off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/isdn/i4l/isdn_tty.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 607d846..d850427 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -998,7 +998,6 @@ isdn_tty_change_speed(modem_info * info)
{
uint cflag,
cval,
- fcr,
quot;
int i;
@@ -1037,7 +1036,6 @@ isdn_tty_change_speed(modem_info * info)
cval |= UART_LCR_PARITY;
if (!(cflag & PARODD))
cval |= UART_LCR_EPAR;
- fcr = 0;
/* CTS flow control flag and modem status interrupts */
if (cflag & CRTSCTS) {
--
1.7.4.3
^ permalink raw reply related
* [PATCH 42/42] be2net: Fix unused-but-set variables.
From: David Miller @ 2011-04-18 0:34 UTC (permalink / raw)
To: netdev
The variables 'tx_min' and 'tx_max' are set but not used in
be_set_coalesce().
Similarly for 'region' in be_do_flash().
Just kill them off.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/benet/be_ethtool.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 80226e4..0f645a9 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -205,9 +205,9 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
struct be_rx_obj *rxo;
struct be_eq_obj *rx_eq;
struct be_eq_obj *tx_eq = &adapter->tx_eq;
- u32 tx_max, tx_min, tx_cur;
u32 rx_max, rx_min, rx_cur;
int status = 0, i;
+ u32 tx_cur;
if (coalesce->use_adaptive_tx_coalesce == 1)
return -EINVAL;
@@ -246,8 +246,6 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
}
}
- tx_max = coalesce->tx_coalesce_usecs_high;
- tx_min = coalesce->tx_coalesce_usecs_low;
tx_cur = coalesce->tx_coalesce_usecs;
if (tx_cur > BE_MAX_EQD)
@@ -664,11 +662,9 @@ be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
{
struct be_adapter *adapter = netdev_priv(netdev);
char file_name[ETHTOOL_FLASH_MAX_FILENAME];
- u32 region;
file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
strcpy(file_name, efl->data);
- region = efl->region;
return be_load_fw(adapter, file_name);
}
--
1.7.4.3
^ permalink raw reply related
* Re: pull request: batman-adv 2011-04-17
From: David Miller @ 2011-04-18 0:38 UTC (permalink / raw)
To: sven; +Cc: netdev, b.a.t.m.a.n
In-Reply-To: <1303068618-27928-1-git-send-email-sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 17 Apr 2011 21:30:10 +0200
> I would like to propose following patches for net-next-2.6/2.6.40. Most of the
> stuff is cleanup work to reduce the locking complexity. The only exception is
> Andrew Lunn's patch, which only adds the initialisation of tx_queue_len.
Pulled, thanks.
^ permalink raw reply
* Re: [PATCH] net: macvlan: convert to hw_features
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, kaber
In-Reply-To: <20110417101546.8337A13A64@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:46 +0200 (CEST)
> Not much of a conversion anyway - macvlan has no way to change the offload
> settings independently to its base device.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: tehuti: convert to hw_features
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, baum, andy
In-Reply-To: <20110417101546.8F6DD13A65@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:46 +0200 (CEST)
> As a side effect, make TX offloads changeable.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: cxgb3: convert to hw_features
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, divy
In-Reply-To: <20110417101546.7EDF613A66@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:46 +0200 (CEST)
> This removes some of the remnants of LRO -> GRO conversion.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: mv643xx: convert to hw_features
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, buytenh
In-Reply-To: <20110417101546.AD95813A68@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:46 +0200 (CEST)
> Side effect: don't reenable RXCSUM on every ifdown/ifup.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: ehea: convert to hw_features
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, leitao
In-Reply-To: <20110417101547.11CF913A69@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: benet: convert to hw_features - fixup
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, sathya.perla, subbu.seetharaman, ajit.khaparde
In-Reply-To: <20110417101547.5F75513A6A@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Remove be_set_flags() as it's already covered by hw_features.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: chelsio: convert to hw_features
From: David Miller @ 2011-04-18 0:42 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev
In-Reply-To: <20110417101546.EE73713A67@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:46 +0200 (CEST)
> @@ -1369,6 +1369,7 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
> const struct cpl_rx_pkt *p;
> struct adapter *adapter = sge->adapter;
> struct sge_port_stats *st;
> + struct net_device *dev = adapter->port[p->iff].dev;
>
> skb = get_packet(adapter->pdev, fl, len - sge->rx_pkt_pad);
> if (unlikely(!skb)) {
You're now using 'p' before it gets initialzed.
^ permalink raw reply
* Re: [PATCH] net: niu: convert to hw_features
From: David Miller @ 2011-04-18 0:44 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev
In-Reply-To: <20110417101547.A22AF13A6D@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Side effect: allow toggling of TX offloads.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: typhoon: convert to hw_features
From: David Miller @ 2011-04-18 0:44 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, dave
In-Reply-To: <20110417101547.7E01A13A6B@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: ibm_newemac: convert to hw_features
From: David Miller @ 2011-04-18 0:44 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev
In-Reply-To: <20110417101547.C207E13A6C@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Side effect: allow toggling of TX offloads.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: greth: convert to hw_features
From: David Miller @ 2011-04-18 0:44 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, kristoffer
In-Reply-To: <20110417101547.D59E313A6F@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)
> Note: Driver modifies its struct net_device_ops. This will break if used for
> multiple devices that are not all the same (if that HW config is possible).
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
I guess for how this chip is used, this is OK for now.
Applied.
^ permalink raw reply
* Re: [PATCH] r8169: Be verbose when unable to load fw patch
From: David Miller @ 2011-04-18 0:45 UTC (permalink / raw)
To: romieu; +Cc: bp, linux-kernel, borislav.petkov, netdev
In-Reply-To: <20110417135936.GA18165@electric-eye.fr.zoreil.com>
From: François Romieu <romieu@metropolis.fr.zoreil.com>
Date: Sun, 17 Apr 2011 15:59:36 +0200
> On Sat, Apr 16, 2011 at 01:03:48PM +0200, François Romieu wrote:
>> [...]
>> > Ok. So will you submit this yourself later or should I just
>> > apply this myself directly to net-2.6?
>>
>> Please apply it directly.
>
> Please don't.
Ok.
^ permalink raw reply
* Re: [PATCH] r8169: add Realtek as maintainer.
From: David Miller @ 2011-04-18 0:46 UTC (permalink / raw)
To: romieu; +Cc: netdev, hayeswang, nic_swsd
In-Reply-To: <20110417141512.GA18236@electric-eye.fr.zoreil.com>
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 17 Apr 2011 16:15:12 +0200
> Per Hayes's request.
>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Applied to net-2.6, thanks.
^ permalink raw reply
* Re: [PATCH 1/1] drivers/net/usb/usbnet.c: Use FIELD_SIZEOF macro in usbnet_init() function.
From: David Miller @ 2011-04-18 0:49 UTC (permalink / raw)
To: tfransosi; +Cc: linux-kernel, dbrownell, gregkh, netdev, linux-usb
In-Reply-To: <3f3e63ecef46abc5d23053c051b3fef52104cbe7.1303080236.git.tfransosi@gmail.com>
From: Thiago Farina <tfransosi@gmail.com>
Date: Sun, 17 Apr 2011 19:46:04 -0300
> Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Applied, thanks.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox