On Wed, Aug 24, 2011 at 12:32 PM, John W. Linville
<linville@xxxxxxxxxxxxx> wrote:
> On Wed, Aug 24, 2011 at 12:27:29PM -0700, Thomas Pedersen wrote:
>> On Wed, Aug 24, 2011 at 12:12 PM, John W. Linville
>> <linville@xxxxxxxxxxxxx> wrote:
>> > This seems a bit less awkward, and avoids the following warning:
>> >
>> > CC [M] net/mac80211/mesh_pathtbl.o
>> > net/mac80211/mesh_pathtbl.c: In function ‘mesh_path_move_to_queue’:
>> > net/mac80211/mesh_pathtbl.c:291:24: warning: ‘cp_skb’ may be used uninitialized in this function
>>
>> cp_skb was initialized to NULL in v2 of "mac80211: mesh gate implementation'
>>
>> >
>> > Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
>> > ---
>> > Does it matter if the copy ends-up on the failq before the original goes
>> > to the gateq?
>> >
>> > net/mac80211/mesh_pathtbl.c | 8 ++++----
>> > 1 files changed, 4 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
>> > index 75e4b60..b5caf5b 100644
>> > --- a/net/mac80211/mesh_pathtbl.c
>> > +++ b/net/mac80211/mesh_pathtbl.c
>> > @@ -307,14 +307,14 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
>> >
>> > while (num_skbs--) {
>> > skb = __skb_dequeue(&failq);
>> > - if (copy)
>> > + if (copy) {
>> > cp_skb = skb_copy(skb, GFP_ATOMIC);
>> > + if (cp_skb)
>> > + __skb_queue_tail(&failq, cp_skb);
>> > + }
>> >
>> > prepare_for_gate(skb, gate_mpath->dst, gate_mpath);
>> > __skb_queue_tail(&gateq, skb);
>> > -
>> > - if (copy && cp_skb)
>> > - __skb_queue_tail(&failq, cp_skb);
>> > }
>>
>> However, this does look nicer. Please be sure to apply the version
>> submitted on 11 August.
>
> You just told me yesterday to apply the 9 August version???
>
OK that is confusing. I meant 9 August version of patch 1/8 only, the
rest should be 11 August.
> John
> --
> John W. Linville Someday the world will need a hero, and you
> linville@xxxxxxxxxxxxx might be all we have. Be ready.
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
