Re: [Acx100-devel] Driver acx-mac80211

[Jim C. <jim...@gm...>]

On Tue, May 8, 2012 at 12:30 PM, Larry Finger <Lar...@lw...> wrote:
> On 05/08/2012 11:46 AM, Oliver Winker wrote:
>>


> I will likely have to use Kismet/wireshark to analyze what is on the air.
>
> The attached patch fixes a lot of the x86_64 warnings. After applying it,
> the device still works on my 64-bit system with an acx111. It has not been
> compiled or run on a 32-bit installation, nor has it been tested with an
> acx100.
>
> Larry
>
>


hi Larry, Oliver,

I just branched master to larry, applied your patch (cleanly)
tested on acx111 pci (good)
then rebased on top of my current HEAD (as sent earlier)
everything works there too.

Oliver,

FWIW, heres my workflow for above

 2397  git checkout master
 2398  git fetch --all
 2399  git checkout -b larry

 2400  git am ~/Downloads/acx100_x86_64_warnings.txt
 2401  git apply ~/Downloads/acx100_x86_64_warnings.txt
 2402  git am ~/Downloads/acx100_x86_64_warnings.txt

git am, apply didnt recognize the patch format (SVN ?)
so I did it with patch

 2404  patch -p1 < ~/Downloads/acx100_x86_64_warnings.txt

 2405  git diff
 2408  git rebase usb-only larry
 2409  git status
 2410  git add common.c mem.c merge.c
 2411  git status -uno
 2412  git commit
 2413  git rebase usb-only larry
 2414  git add merge.c mem.c common.c
 2415  git rebase --continue
 2417  git log -1
 2418  history | grep git | tail -n20

jimc@chumly:~/projects/lx/acx-mac80211$ git log -1
commit 99c78faee7bd14a94b70cd372ff9e95eb9faf9d2
Author: Jim Cromie <jim...@gm...>
Date:   Tue May 8 14:27:23 2012 -0600

    fix 32/64 warnings

    This patch, from Larry Finger, fixes a bunch of warnings, basically by
    changing casts from (u32) to (ulong), which varies with the other
    native types that are either casted, or assigned the casted value.


jimc@chumly:~/projects/lx/acx-mac80211$ date
Tue May  8 14:41:59 MDT 2012

So it took 14 minutes from clean commit on master,
fumbling around with git am, apply,
starting rebase
resolving conflicts in 3 files, (all simple)
to rebase complete.

pretty quick and easy.

Im gonna --amend it to cc Larry, and send with git send-email