* Re: [net-next-2.6 PATCH v2 3/3] net_sched: implement a root container qdisc sch_mclass
From: Jarek Poplawski @ 2010-12-31 9:25 UTC (permalink / raw)
To: John Fastabend
Cc: davem, netdev, hadi, shemminger, tgraf, eric.dumazet, bhutchings,
nhorman
In-Reply-To: <20101221192930.9703.63791.stgit@jf-dev1-dcblab>
On 2010-12-21 20:29, John Fastabend wrote:
> This implements a mclass 'multi-class' queueing discipline that by
> default creates multiple mq qdisc's one for each traffic class. Each
> mq qdisc then owns a range of queues per the netdev_tc_txq mappings.
Btw, you could also consider better name (mqprio?) because there're
many 'multi-class' queueing disciplines around.
> +static int mclass_parse_opt(struct net_device *dev, struct tc_mclass_qopt *qopt)
> +{
> + int i, j;
> +
> + /* Verify TC offset and count are sane */
if (qopt->num_tc > TC_MAX_QUEUE) ?
return -EINVAL;
> + for (i = 0; i < qopt->num_tc; i++) {
> + int last = qopt->offset[i] + qopt->count[i];
> + if (last > dev->num_tx_queues)
if (last >= dev->num_tx_queues) ?
> + return -EINVAL;
> + for (j = i + 1; j < qopt->num_tc; j++) {
> + if (last > qopt->offset[j])
if (last >= qopt->offset[j]) ?
Jarek P.
^ permalink raw reply
* Re: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Dan Carpenter @ 2010-12-31 9:11 UTC (permalink / raw)
To: Justin P. Mattock
Cc: Grant Likely, trivial, devel, linux-scsi, netdev, linux-usb,
linux-wireless, linux-kernel, ivtv-devel, linux-m68k,
spi-devel-general, linux-media
In-Reply-To: <4D1D7DAE.7060504@gmail.com>
On Thu, Dec 30, 2010 at 10:52:30PM -0800, Justin P. Mattock wrote:
> On 12/30/2010 10:45 PM, Grant Likely wrote:
> >On Thu, Dec 30, 2010 at 03:07:51PM -0800, Justin P. Mattock wrote:
> >>The below patch fixes a typo "diable" to "disable". Please let me know if this
> >>is correct or not.
> >>
> >>Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
> >
> >applied, thanks.
> >
> >g.
>
> ahh.. thanks.. just cleared up the left out diabled that I had
> thought I forgotten(ended up separating comments and code and
> forgot)
This is really just defensiveness and random grumbling and grumpiness on
my part, but one reason I may have missed the first patch is because
your subject lines are crap.
Wrong: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
Right: [PATCH 02/15] spi/dw_spi: Typo change diable to disable
regards,
dan carpenter
^ permalink raw reply
* Re: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-31 6:52 UTC (permalink / raw)
To: Grant Likely
Cc: trivial, devel, linux-scsi, netdev, linux-usb, linux-wireless,
linux-kernel, ivtv-devel, linux-m68k, spi-devel-general,
linux-media, Dan Carpenter
In-Reply-To: <20101231064515.GC3733@angua.secretlab.ca>
On 12/30/2010 10:45 PM, Grant Likely wrote:
> On Thu, Dec 30, 2010 at 03:07:51PM -0800, Justin P. Mattock wrote:
>> The below patch fixes a typo "diable" to "disable". Please let me know if this
>> is correct or not.
>>
>> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
>
> applied, thanks.
>
> g.
ahh.. thanks.. just cleared up the left out diabled that I had thought I
forgotten(ended up separating comments and code and forgot)
>
>>
>> ---
>> drivers/spi/dw_spi.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
>> index 0838c79..7c3cf21 100644
>> --- a/drivers/spi/dw_spi.c
>> +++ b/drivers/spi/dw_spi.c
>> @@ -592,7 +592,7 @@ static void pump_transfers(unsigned long data)
>> spi_set_clk(dws, clk_div ? clk_div : chip->clk_div);
>> spi_chip_sel(dws, spi->chip_select);
>>
>> - /* Set the interrupt mask, for poll mode just diable all int */
>> + /* Set the interrupt mask, for poll mode just disable all int */
>> spi_mask_intr(dws, 0xff);
>> if (imask)
>> spi_umask_intr(dws, imask);
>> --
>> 1.6.5.2.180.gc5b3e
>>
>>
>> ------------------------------------------------------------------------------
>> Learn how Oracle Real Application Clusters (RAC) One Node allows customers
>> to consolidate database storage, standardize their database environment, and,
>> should the need arise, upgrade to a full multi-node Oracle RAC database
>> without downtime or disruption
>> http://p.sf.net/sfu/oracle-sfdevnl
>> _______________________________________________
>> spi-devel-general mailing list
>> spi-devel-general@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/spi-devel-general
>
Justin P. Mattock
^ permalink raw reply
* Re: [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Grant Likely @ 2010-12-31 6:45 UTC (permalink / raw)
To: Justin P. Mattock
Cc: devel, trivial, linux-scsi, netdev, linux-usb, linux-wireless,
linux-kernel, ivtv-devel, linux-m68k, spi-devel-general,
linux-media
In-Reply-To: <1293750484-1161-2-git-send-email-justinmattock@gmail.com>
On Thu, Dec 30, 2010 at 03:07:51PM -0800, Justin P. Mattock wrote:
> The below patch fixes a typo "diable" to "disable". Please let me know if this
> is correct or not.
>
> Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
applied, thanks.
g.
>
> ---
> drivers/spi/dw_spi.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
> index 0838c79..7c3cf21 100644
> --- a/drivers/spi/dw_spi.c
> +++ b/drivers/spi/dw_spi.c
> @@ -592,7 +592,7 @@ static void pump_transfers(unsigned long data)
> spi_set_clk(dws, clk_div ? clk_div : chip->clk_div);
> spi_chip_sel(dws, spi->chip_select);
>
> - /* Set the interrupt mask, for poll mode just diable all int */
> + /* Set the interrupt mask, for poll mode just disable all int */
> spi_mask_intr(dws, 0xff);
> if (imask)
> spi_umask_intr(dws, imask);
> --
> 1.6.5.2.180.gc5b3e
>
>
> ------------------------------------------------------------------------------
> Learn how Oracle Real Application Clusters (RAC) One Node allows customers
> to consolidate database storage, standardize their database environment, and,
> should the need arise, upgrade to a full multi-node Oracle RAC database
> without downtime or disruption
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general
^ permalink raw reply
* Re: [PATCH 15/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-31 6:38 UTC (permalink / raw)
To: Dan Carpenter, trivial, devel, linux-scsi, netdev, linux-usb,
linux-wireless
In-Reply-To: <20101231063433.GB1886@bicker>
On 12/30/2010 10:34 PM, Dan Carpenter wrote:
> On Thu, Dec 30, 2010 at 03:08:04PM -0800, Justin P. Mattock wrote:
>> The below patch fixes a typo "diable" to "disable". Please let me know if this
>> is correct or not.
>>
>> Signed-off-by: Justin P. Mattock<justinmattock@gmail.com>
>>
>> ---
>> drivers/spi/dw_spi.c | 6 +++---
>
> You missed one from this file:
>
> /* Set the interrupt mask, for poll mode just diable all int */
> ^^^^^^
> regards,
> dan carpenter
>
>
oh-man... my grepping wasn't so grepping after all.. thanks for that
I'll resend this one
Justin P. Mattock
^ permalink raw reply
* Re: [PATCH 15/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Dan Carpenter @ 2010-12-31 6:34 UTC (permalink / raw)
To: Justin P. Mattock
Cc: trivial, devel, linux-scsi, netdev, linux-usb, linux-wireless,
linux-kernel, ivtv-devel, linux-m68k, spi-devel-general,
linux-media
In-Reply-To: <1293750484-1161-15-git-send-email-justinmattock@gmail.com>
On Thu, Dec 30, 2010 at 03:08:04PM -0800, Justin P. Mattock wrote:
> The below patch fixes a typo "diable" to "disable". Please let me know if this
> is correct or not.
>
> Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
>
> ---
> drivers/spi/dw_spi.c | 6 +++---
You missed one from this file:
/* Set the interrupt mask, for poll mode just diable all int */
^^^^^^
regards,
dan carpenter
^ permalink raw reply
* Re: Why do programs freeze with big network transfers?
From: Adam Nielsen @ 2010-12-31 1:20 UTC (permalink / raw)
To: Eric Dumazet; +Cc: linux-kernel, netdev
In-Reply-To: <1293695919.7150.18.camel@edumazet-laptop>
>> After a few seconds of data going over the network, X-Windows freezes. No
>> screen updates, the mouse cursor won't move, for all intents and purposes the
>> system has frozen solid. I'm playing music with XMMS2 and that keeps going,
>> but occasionally even that stops too. After a minute (between 45 and 65
>> seconds) everything unfreezes and keeps going as per normal. Less than 10
>> seconds later everything freezes again for another minute! This keeps going
>> until the file transfer has finished.
>
> This rings a bell here, could you try to apply commit
>
> 482964e56e1320cb7952faa1932d8ecf59c4bf75
> (net: Fix the condition passed to sk_wait_event())
>
> This commit was included in 2.6.36, so you could also try 2.6.36.2
> kernel.
Just booted into 2.6.36.2 and it looks like the problem has indeed been fixed!
I've been able to perform the same transfer that would previously cause a
freeze 100% of the time and it went through fine.
Many thanks for your help!
Cheers,
Adam.
^ permalink raw reply
* Re: [*v3 PATCH 14/22] IPVS: netns awareness to ip_vs_sync
From: Simon Horman @ 2010-12-31 0:44 UTC (permalink / raw)
To: hans
Cc: ja, daniel.lezcano, wensong, lvs-devel, netdev, netfilter-devel,
Hans Schillstrom
In-Reply-To: <1293706266-27152-15-git-send-email-hans@schillstrom.com>
On Thu, Dec 30, 2010 at 11:50:58AM +0100, hans@schillstrom.com wrote:
> From: Hans Schillstrom <hans.schillstrom@ericsson.com>
>
> All global variables moved to struct ipvs,
> most external changes fixed (i.e. init_net removed)
> in sync_buf create + 4 replaced by sizeof(struct..)
[ snip ]
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 0454a11..5d6e250 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -1477,6 +1477,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
> struct ip_vs_proto_data *pd;
> struct ip_vs_conn *cp;
> int ret, restart, pkts;
> + struct net *net;
The line above adds a duplicate declaration of net as
just before the diff-context starts there is
struct net *net = NULL;
^ permalink raw reply
* Re: [*v3 PATCH 01/22] IPVS: netns, add basic init per netns.
From: Jan Engelhardt @ 2010-12-30 23:58 UTC (permalink / raw)
To: hans
Cc: horms, ja, daniel.lezcano, wensong, lvs-devel, netdev,
netfilter-devel, Hans Schillstrom
In-Reply-To: <1293706266-27152-2-git-send-email-hans@schillstrom.com>
On Thursday 2010-12-30 11:50, hans@schillstrom.com wrote:
>+++ b/include/net/ip_vs.h
>@@ -28,6 +28,15 @@
> #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
> #include <net/netfilter/nf_conntrack.h>
> #endif
>+#include <net/net_namespace.h> /* Netw namespace */
>+
>+/*
>+ * Generic access of ipvs struct
>+ */
>+static inline struct netns_ipvs * net_ipvs(struct net* net)
Balancing the '*' between the ' ' would be nice... I know it's hard at this
time of the year ;-)
>diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h
>new file mode 100644
>index 0000000..9068d95
>--- /dev/null
>+++ b/include/net/netns/ip_vs.h
>@@ -0,0 +1,26 @@
>+/*
>+ * ip_vs.h
>+ *
>+ * Created on: Nov 23, 2010
>+ * Author: hans
>+ */
Filenames, creation dates, author names (when they don't serve a copyright
notice), CVS $Id$ tags, etc. don't belong into files. The git log exists for
that very purpose.
>+struct netns_ipvs {
>+ int inc; /* Incarnation */
>+};
Just my thoughts: Incarnation - haven't heard that in a while. ("inc"
is also used as an abbreviation for increment, so ~ ~). Other places
use "generation" as a term (such as the VFS on inode generation). [I
also get the feeling that (re)"incarnation" may require a death, so
it is different from "generation" after all -]
>+++ b/net/netfilter/ipvs/ip_vs_core.c
>@@ -1813,6 +1820,44 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
> #endif
> };
>
>+/*
>+ * Initialize IP Virtual Server netns mem.
>+ */
>+static int __net_init __ip_vs_init(struct net *net)
>+{
>+ struct netns_ipvs *ipvs;
>+
>+ if (!net_eq(net, &init_net)) {
>+ pr_err("The final patch for enabling netns is missing\n");
>+ return -EPERM;
>+ }
>+ ipvs = (struct netns_ipvs *)net_generic(net, ip_vs_net_id);
Pointless cast is pointless.
>index c1c167a..ea390f8 100644
>--- a/net/netfilter/ipvs/ip_vs_sync.c
>+++ b/net/netfilter/ipvs/ip_vs_sync.c
>@@ -1639,3 +1639,31 @@ int stop_sync_thread(int state)
>
> return 0;
> }
>+
>+/*
>+ * Initialize data struct for each netns
>+ */
>+static int __net_init __ip_vs_sync_init(struct net *net)
>+{
>+ return 0;
>+}
>+
>+static void __ip_vs_sync_cleanup(struct net *net)
>+{
>+ return;
>+}
The trailing return; in functions returning nothing can be (and
generally, is) omitted.
^ permalink raw reply
* Re: [net-next-2.6 PATCH v2 3/3] net_sched: implement a root container qdisc sch_mclass
From: Jarek Poplawski @ 2010-12-30 23:56 UTC (permalink / raw)
To: John Fastabend
Cc: davem, netdev, hadi, shemminger, tgraf, eric.dumazet, bhutchings,
nhorman
In-Reply-To: <4D1D17C9.3040500@gmail.com>
Jarek Poplawski wrote:
> John Fastabend wrote:
...
>> + for (i = 0; i < dev->num_tc; i++) {
>> + dev_queue = netdev_get_tx_queue(dev, dev->tc_to_txq[i].offset);
>
> Are these offsets etc. validated?
They are... Forget this last question.
Jarek P.
^ permalink raw reply
* Re: [net-next-2.6 PATCH v2 3/3] net_sched: implement a root container qdisc sch_mclass
From: Jarek Poplawski @ 2010-12-30 23:37 UTC (permalink / raw)
To: John Fastabend
Cc: davem, netdev, hadi, shemminger, tgraf, eric.dumazet, bhutchings,
nhorman
In-Reply-To: <20101221192930.9703.63791.stgit@jf-dev1-dcblab>
John Fastabend wrote:
> This implements a mclass 'multi-class' queueing discipline that by
> default creates multiple mq qdisc's one for each traffic class. Each
> mq qdisc then owns a range of queues per the netdev_tc_txq mappings.
Is it really necessary to add one more abstraction layer for this,
probably not most often used (or even asked by users), functionality?
Why mclass can't simply do these few things more instead of attaching
(and changing) mq?
...
> diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
> index 0af57eb..723ee52 100644
> --- a/include/net/sch_generic.h
> +++ b/include/net/sch_generic.h
> @@ -50,6 +50,7 @@ struct Qdisc {
> #define TCQ_F_INGRESS 4
> #define TCQ_F_CAN_BYPASS 8
> #define TCQ_F_MQROOT 16
> +#define TCQ_F_MQSAFE 32
If every other qdisc added a flag for qdiscs it likes...
> @@ -709,7 +709,13 @@ static void attach_default_qdiscs(struct net_device *dev)
> dev->qdisc = txq->qdisc_sleeping;
> atomic_inc(&dev->qdisc->refcnt);
> } else {
> - qdisc = qdisc_create_dflt(txq, &mq_qdisc_ops, TC_H_ROOT);
> + if (dev->num_tc)
Actually, where this num_tc is expected to be set? I can see it inside
mclass only, with unsetting on destruction, but probably I miss something.
> + qdisc = qdisc_create_dflt(txq, &mclass_qdisc_ops,
> + TC_H_ROOT);
> + else
> + qdisc = qdisc_create_dflt(txq, &mq_qdisc_ops,
> + TC_H_ROOT);
> +
> +static int mclass_init(struct Qdisc *sch, struct nlattr *opt)
> +{
> + struct net_device *dev = qdisc_dev(sch);
> + struct mclass_sched *priv = qdisc_priv(sch);
> + struct netdev_queue *dev_queue;
> + struct Qdisc *qdisc;
> + int i, err = -EOPNOTSUPP;
> + struct tc_mclass_qopt *qopt = NULL;
> +
> + /* Unwind attributes on failure */
> + u8 unwnd_tc = dev->num_tc;
> + u8 unwnd_map[16];
[TC_MAX_QUEUE] ?
> + struct netdev_tc_txq unwnd_txq[16];
> +
> + if (sch->parent != TC_H_ROOT)
> + return -EOPNOTSUPP;
> +
> + if (!netif_is_multiqueue(dev))
> + return -EOPNOTSUPP;
> +
> + if (nla_len(opt) < sizeof(*qopt))
> + return -EINVAL;
> + qopt = nla_data(opt);
> +
> + memcpy(unwnd_map, dev->prio_tc_map, sizeof(unwnd_map));
> + memcpy(unwnd_txq, dev->tc_to_txq, sizeof(unwnd_txq));
> +
> + /* If the mclass options indicate that hardware should own
> + * the queue mapping then run ndo_setup_tc if this can not
> + * be done fail immediately.
> + */
> + if (qopt->hw && dev->netdev_ops->ndo_setup_tc) {
> + priv->hw_owned = 1;
> + if (dev->netdev_ops->ndo_setup_tc(dev, qopt->num_tc))
> + return -EINVAL;
> + } else if (!qopt->hw) {
> + if (mclass_parse_opt(dev, qopt))
> + return -EINVAL;
> +
> + if (netdev_set_num_tc(dev, qopt->num_tc))
> + return -ENOMEM;
> +
> + for (i = 0; i < qopt->num_tc; i++)
> + netdev_set_tc_queue(dev, i,
> + qopt->count[i], qopt->offset[i]);
> + } else {
> + return -EINVAL;
> + }
> +
> + /* Always use supplied priority mappings */
> + for (i = 0; i < 16; i++) {
i < qopt->num_tc ?
> + if (netdev_set_prio_tc_map(dev, i, qopt->prio_tc_map[i])) {
> + err = -EINVAL;
> + goto tc_err;
> + }
> + }
> +
> + /* pre-allocate qdisc, attachment can't fail */
> + priv->qdiscs = kcalloc(qopt->num_tc,
> + sizeof(priv->qdiscs[0]), GFP_KERNEL);
> + if (priv->qdiscs == NULL) {
> + err = -ENOMEM;
> + goto tc_err;
> + }
> +
> + for (i = 0; i < dev->num_tc; i++) {
> + dev_queue = netdev_get_tx_queue(dev, dev->tc_to_txq[i].offset);
Are these offsets etc. validated?
Jarek P.
^ permalink raw reply
* RE: [PATCH net-2.6] bridge: fix br_multicast_ipv6_rcv for paged skbs
From: Winkler, Tomas @ 2010-12-30 23:29 UTC (permalink / raw)
To: Stephen Hemminger, Stephen Hemminger, Johannes Berg
Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org ,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
In-Reply-To: <9mk4bme8o97ir27xi8a9fbsd.1293750376929-2ueSQiBKiTY7tOexoI0I+QC/G2K4zDHf@public.gmane.org>
> -----Original Message-----
> From: Stephen Hemminger [mailto:stephen.hemminger@vyatta.com]
> Sent: Friday, December 31, 2010 1:06 AM
> To: Winkler, Tomas; Stephen Hemminger; Johannes Berg
> Cc: davem@davemloft.net; netdev@vger.kernel.org ; linux-
> wireless@vger.kernel.org
> Subject: RE: [PATCH net-2.6] bridge: fix br_multicast_ipv6_rcv for paged
> skbs
>
> Although copy is slower for large packets, this is a non performance path.
> The code in question is for bridged multicast Ipv6 ICMP packets. This case
> is so uncritical it could be done in BASIC and no one could possibly care!
>
Fair enough, although you got few of those when you connect to win7 client.
Anyhow my fix would work if the second pull would be
if (!pskb_may_pull(skb2, sizeof(struct mld_msg))) instead of (!pskb_may_pull(skb2, sizeof(*icmp6h)))
Second I think just that non multicast places shouldn't be fixed contrary to my previous suggestion as the
skb_network_header(skb) + offset + 1 - skb->data will give you correct offset to pull up if the network header is not on skb->data.
Thanks
Tomas
> "Winkler, Tomas" <tomas.winkler@intel.com> wrote:
>
> >
> >
> >> -----Original Message-----
> >> From: Stephen Hemminger [mailto:shemminger@vyatta.com]
> >> Sent: Thursday, December 30, 2010 9:06 PM
> >> To: Johannes Berg
> >> Cc: Winkler, Tomas; davem@davemloft.net; netdev@vger.kernel.org; linux-
> >> wireless@vger.kernel.org
> >> Subject: Re: [PATCH net-2.6] bridge: fix br_multicast_ipv6_rcv for paged
> >> skbs
> >>
> >> On Thu, 30 Dec 2010 19:52:14 +0100
> >> Johannes Berg <johannes@sipsolutions.net> wrote:
> >>
> >> > On Thu, 2010-12-30 at 10:46 -0800, Stephen Hemminger wrote:
> >> >
> >> > > This doesn't look correct. The calculation of the offset doesn't look
> >> correct.
> >> > > Just following the skb_clone(), the skb_pull value is "offset".
> >> > > Also, the other checks return -EINVAL for incorrectly formed packet.
> >> > >
> >> > > --- a/net/bridge/br_multicast.c 2010-12-30 10:29:58.579510488 -0800
> >> > > +++ b/net/bridge/br_multicast.c 2010-12-30 10:43:27.273386691 -0800
> >> > > @@ -1464,6 +1464,9 @@ static int br_multicast_ipv6_rcv(struct
> >> > > if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
> >> > > return 0;
> >> > >
> >> > > + if (!pskb_may_pull(skb, offset))
> >> > > + return -EINVAL;
> >> > > +
> >> > > /* Okay, we found ICMPv6 header */
> >> > > skb2 = skb_clone(skb, GFP_ATOMIC);
> >> > > if (!skb2)
> >> >
> >> > Wouldn't that make more sense after the clone anyway? But if you look
> at
> >> > my email, you'll find that there's potentially, and conditionally, more
> >> > stuff that will be read from the skb's header, which hasn't necessarily
> >> > been pulled in, so I think this still won't fix all the issues.
> >> >
> >> > Seeing how this only affects some ICMPv6 packets, maybe we should just
> >> > use skb_copy() instead?
> >>
> >> It comes out cleaner, and the check can be simplified.
> >>
> >> --- a/net/bridge/br_multicast.c 2010-12-30 10:47:12.031733855 -0800
> >> +++ b/net/bridge/br_multicast.c 2010-12-30 11:00:12.135801266 -0800
> >> @@ -1465,19 +1465,19 @@ static int br_multicast_ipv6_rcv(struct
> >> return 0;
> >>
> >> /* Okay, we found ICMPv6 header */
> >> - skb2 = skb_clone(skb, GFP_ATOMIC);
> >> + skb2 = skb_copy(skb, GFP_ATOMIC);
> >> if (!skb2)
> >> return -ENOMEM;
> >>
> >> + err = -EINVAL;
> >> + if (skb2->len < offset + sizeof(*icmp6h))
> >> + goto out;
> >> +
> >> len -= offset - skb_network_offset(skb2);
> >>
> >> __skb_pull(skb2, offset);
> >> skb_reset_transport_header(skb2);
> >>
> >> - err = -EINVAL;
> >> - if (!pskb_may_pull(skb2, sizeof(*icmp6h)))
> >> - goto out;
> >> -
> >> icmp6h = icmp6_hdr(skb2);
> >>
> >> switch (icmp6h->icmp6_type) {
> >>
> >>
> >Sorry for dump question but isn't there performance penalty on using
> skb_copy vs. skb_clone?
> >
> >Anyhow Below is a code snippet from ip6_input.c so you probably would want
> to fix it all over.
> >BTW offset and the pointer arithmetic really gives the same number +1, I'm
> not surly why the original author would thought it be safer than just using
> offset.
> >
> > offset = ipv6_skip_exthdr(skb,
> sizeof(*hdr),
> > &nexthdr);
> > if (offset < 0)
> > goto out;
> >
> > if (nexthdr != IPPROTO_ICMPV6)
> > goto out;
> >
> > if (!pskb_may_pull(skb,
> (skb_network_header(skb) +
> > offset + 1 - skb-
> >data)))
> > goto out;
> >
> > icmp6 = (struct icmp6hdr
> *)(skb_network_header(skb) + offset);
> >
> >
> >
> >Thanks
> >Tomas
> >
> >
> >---------------------------------------------------------------------
> >Intel Israel (74) Limited
> >
> >This e-mail and any attachments may contain confidential material for
> >the sole use of the intended recipient(s). Any review or distribution
> >by others is strictly prohibited. If you are not the intended
> >recipient, please contact the sender and delete all copies.
> >
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply
* [PATCH 11/15]drivers:media:video:cx18:cx23418.h Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:08 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-10-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/media/video/cx18/cx23418.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 2c00980..7e40035 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -177,7 +177,7 @@
IN[0] - Task handle.
IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only,
3 = 2D H/V separable, 4 = 2D symmetric non-separable
- IN[2] - chroma type: 0 - diable, 1 = 1D horizontal
+ IN[2] - chroma type: 0 - disable, 1 = 1D horizontal
ReturnCode - One of the ERR_CAPTURE_... */
#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 10/15]drivers:usb:gadget:langwell Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-9-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/usb/gadget/langwell_udc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index b8ec954..dad278f 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -3063,7 +3063,7 @@ static void langwell_udc_remove(struct pci_dev *pdev)
kfree(dev->ep);
- /* diable IRQ handler */
+ /* disable IRQ handler */
if (dev->got_irq)
free_irq(pdev->irq, dev);
@@ -3383,7 +3383,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state)
/* disable interrupt and set controller to stop state */
langwell_udc_stop(dev);
- /* diable IRQ handler */
+ /* disable IRQ handler */
if (dev->got_irq)
free_irq(pdev->irq, dev);
dev->got_irq = 0;
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 02/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-1-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/spi/dw_spi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 0838c79..7c3cf21 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -592,7 +592,7 @@ static void pump_transfers(unsigned long data)
spi_set_clk(dws, clk_div ? clk_div : chip->clk_div);
spi_chip_sel(dws, spi->chip_select);
- /* Set the interrupt mask, for poll mode just diable all int */
+ /* Set the interrupt mask, for poll mode just disable all int */
spi_mask_intr(dws, 0xff);
if (imask)
spi_umask_intr(dws, imask);
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 01/15]arch:m68k:ifpsp060:src:fpsp.S Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
arch/m68k/ifpsp060/src/fpsp.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 73613b5..26e85e2 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -3881,7 +3881,7 @@ _fpsp_fline:
# FP Unimplemented Instruction stack frame and jump to that entry
# point.
#
-# but, if the FPU is disabled, then we need to jump to the FPU diabled
+# but, if the FPU is disabled, then we need to jump to the FPU disabled
# entry point.
movc %pcr,%d0
btst &0x1,%d0
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 15/15]drivers:spi:dw_spi.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:08 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-14-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/spi/dw_spi.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 7c3cf21..a3a065f 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -910,12 +910,12 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
ret = init_queue(dws);
if (ret) {
dev_err(&master->dev, "problem initializing queue\n");
- goto err_diable_hw;
+ goto err_disable_hw;
}
ret = start_queue(dws);
if (ret) {
dev_err(&master->dev, "problem starting queue\n");
- goto err_diable_hw;
+ goto err_disable_hw;
}
spi_master_set_devdata(master, dws);
@@ -930,7 +930,7 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
err_queue_alloc:
destroy_queue(dws);
-err_diable_hw:
+err_disable_hw:
spi_enable_chip(dws, 0);
free_irq(dws->irq, dws);
err_free_master:
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 14/15]include:media:davinci:vpss.h Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:08 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-13-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
include/media/davinci/vpss.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
index c59cc02..b586495 100644
--- a/include/media/davinci/vpss.h
+++ b/include/media/davinci/vpss.h
@@ -44,7 +44,7 @@ struct vpss_pg_frame_size {
short pplen;
};
-/* Used for enable/diable VPSS Clock */
+/* Used for enable/disable VPSS Clock */
enum vpss_clock_sel {
/* DM355/DM365 */
VPSS_CCDC_CLOCK,
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 13/15]drivers:isdn:mISDN:dsp_cmx.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:08 UTC (permalink / raw)
To: trivial-DgEjT+Ai2ygdnm+yROfE0A
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
ivtv-devel-jGorlIydJmRM656bX5wj8A,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b, Justin P. Mattock,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1293750484-1161-12-git-send-email-justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/isdn/mISDN/dsp_cmx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 76d9e67..309bacf 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -112,7 +112,7 @@
* Disable rx-data:
* If cmx is realized in hardware, rx data will be disabled if requested by
* the upper layer. If dtmf decoding is done by software and enabled, rx data
- * will not be diabled but blocked to the upper layer.
+ * will not be disabled but blocked to the upper layer.
*
* HFC conference engine:
* If it is possible to realize all features using hardware, hardware will be
--
1.6.5.2.180.gc5b3e
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply related
* [PATCH 12/15]drivers:media:video:tvp7002.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:08 UTC (permalink / raw)
To: trivial-DgEjT+Ai2ygdnm+yROfE0A
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
ivtv-devel-jGorlIydJmRM656bX5wj8A,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b, Justin P. Mattock,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1293750484-1161-11-git-send-email-justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/media/video/tvp7002.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c
index e63b40f..c799e4e 100644
--- a/drivers/media/video/tvp7002.c
+++ b/drivers/media/video/tvp7002.c
@@ -789,7 +789,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
* Get the value of a TVP7002 decoder device register.
* Returns zero when successful, -EINVAL if register read fails or
* access to I2C client fails, -EPERM if the call is not allowed
- * by diabled CAP_SYS_ADMIN.
+ * by disabled CAP_SYS_ADMIN.
*/
static int tvp7002_g_register(struct v4l2_subdev *sd,
struct v4l2_dbg_register *reg)
--
1.6.5.2.180.gc5b3e
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply related
* [PATCH 09/15]drivers:usb:host Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial-DgEjT+Ai2ygdnm+yROfE0A
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
ivtv-devel-jGorlIydJmRM656bX5wj8A,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b, Justin P. Mattock,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1293750484-1161-8-git-send-email-justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The below patch fixes a typo "diable" to "disable" and also fixes another typo in a comment.
Please let me know if this is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/usb/host/fhci-hcd.c | 4 ++--
drivers/usb/host/fhci-tds.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 20092a2..12fd184 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -98,13 +98,13 @@ void fhci_usb_enable_interrupt(struct fhci_usb *usb)
usb->intr_nesting_cnt--;
}
-/* diable the usb interrupt */
+/* disable the usb interrupt */
void fhci_usb_disable_interrupt(struct fhci_usb *usb)
{
struct fhci_hcd *fhci = usb->fhci;
if (usb->intr_nesting_cnt == 0) {
- /* diable the timer interrupt */
+ /* disable the timer interrupt */
disable_irq_nosync(fhci->timer->irq);
/* disable the usb interrupt */
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 7be548c..38fe058 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -271,8 +271,8 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep,
/*
* Collect the submitted frames and inform the application about them
- * It is also prepearing the TDs for new frames. If the Tx interrupts
- * are diabled, the application should call that routine to get
+ * It is also preparing the TDs for new frames. If the Tx interrupts
+ * are disabled, the application should call that routine to get
* confirmation about the submitted frames. Otherwise, the routine is
* called frome the interrupt service routine during the Tx interrupt.
* In that case the application is informed by calling the application
--
1.6.5.2.180.gc5b3e
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply related
* [PATCH 08/15]drivers:scsi:lpfc:lpfc_init.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-7-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/scsi/lpfc/lpfc_init.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index b306579..a921f16 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -7661,7 +7661,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
* the HBA.
*/
- /* HBA interrupt will be diabled after this call */
+ /* HBA interrupt will be disabled after this call */
lpfc_sli_hba_down(phba);
/* Stop kthread signal shall trigger work_done one more time */
kthread_stop(phba->worker_thread);
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
* [PATCH 07/15]drivers:net:wireless:iwlwifi Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial-DgEjT+Ai2ygdnm+yROfE0A
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
ivtv-devel-jGorlIydJmRM656bX5wj8A,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b, Justin P. Mattock,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1293750484-1161-6-git-send-email-justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++--
drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
index a5dbfea..b5cb3be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
@@ -197,7 +197,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
none:
/* re-enable interrupts here since we don't have anything to service. */
- /* only Re-enable if diabled by irq and no schedules tasklet. */
+ /* only Re-enable if disabled by irq and no schedules tasklet. */
if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta)
iwl_enable_interrupts(priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c2636a7..9b912c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1316,7 +1316,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
}
/* Re-enable all interrupts */
- /* only Re-enable if diabled by irq */
+ /* only Re-enable if disabled by irq */
if (test_bit(STATUS_INT_ENABLED, &priv->status))
iwl_enable_interrupts(priv);
@@ -1530,7 +1530,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
}
/* Re-enable all interrupts */
- /* only Re-enable if diabled by irq */
+ /* only Re-enable if disabled by irq */
if (test_bit(STATUS_INT_ENABLED, &priv->status))
iwl_enable_interrupts(priv);
}
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 25fb391..8700ab3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1304,7 +1304,7 @@ irqreturn_t iwl_isr_legacy(int irq, void *data)
none:
/* re-enable interrupts here since we don't have anything to service. */
- /* only Re-enable if diabled by irq */
+ /* only Re-enable if disabled by irq */
if (test_bit(STATUS_INT_ENABLED, &priv->status))
iwl_enable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags);
--
1.6.5.2.180.gc5b3e
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply related
* [PATCH 06/15]drivers:staging:xgifb:vb_setmode.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial-DgEjT+Ai2ygdnm+yROfE0A
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-scsi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
ivtv-devel-jGorlIydJmRM656bX5wj8A,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b, Justin P. Mattock,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linux-media-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1293750484-1161-5-git-send-email-justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/staging/xgifb/vb_setmode.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 7016fdd..fb49641 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1920,7 +1920,7 @@ void XGI_SetCRT1FIFO(unsigned short ModeNo,
data = XGINew_GetReg1(pVBInfo->P3c4, 0x3D);
data &= 0xfe;
- XGINew_SetReg1(pVBInfo->P3c4, 0x3D, data); /* diable auto-threshold */
+ XGINew_SetReg1(pVBInfo->P3c4, 0x3D, data); /* disable auto-threshold */
if (ModeNo > 0x13) {
XGINew_SetReg1(pVBInfo->P3c4, 0x08, 0x34);
--
1.6.5.2.180.gc5b3e
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
^ permalink raw reply related
* [PATCH 05/15]drivers:staging:vt6655:rf.c Typo change diable to disable.
From: Justin P. Mattock @ 2010-12-30 23:07 UTC (permalink / raw)
To: trivial
Cc: linux-m68k, linux-kernel, netdev, ivtv-devel, linux-media,
linux-wireless, linux-scsi, spi-devel-general, devel, linux-usb,
Justin P. Mattock
In-Reply-To: <1293750484-1161-4-git-send-email-justinmattock@gmail.com>
The below patch fixes a typo "diable" to "disable". Please let me know if this
is correct or not.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
---
drivers/staging/vt6655/rf.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index b8ec783..cdd9165 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -496,11 +496,11 @@ bool s_bAL7230Init (unsigned long dwIoBase)
//Calibration
MACvTimer0MicroSDelay(dwIoBase, 150);//150us
- bResult &= IFRFbWriteEmbeded(dwIoBase, (0x9ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW)); //TXDCOC:active, RCK:diable
+ bResult &= IFRFbWriteEmbeded(dwIoBase, (0x9ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW)); //TXDCOC:active, RCK:disable
MACvTimer0MicroSDelay(dwIoBase, 30);//30us
- bResult &= IFRFbWriteEmbeded(dwIoBase, (0x3ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW)); //TXDCOC:diable, RCK:active
+ bResult &= IFRFbWriteEmbeded(dwIoBase, (0x3ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW)); //TXDCOC:disable, RCK:active
MACvTimer0MicroSDelay(dwIoBase, 30);//30us
- bResult &= IFRFbWriteEmbeded(dwIoBase, dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]); //TXDCOC:diable, RCK:diable
+ bResult &= IFRFbWriteEmbeded(dwIoBase, dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]); //TXDCOC:diable, RCK:disable
MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 |
SOFTPWRCTL_SWPE2 |
--
1.6.5.2.180.gc5b3e
^ permalink raw reply related
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