#7 reverse some of the rev 31 and 36 changes

closed-fixed
nobody
None
5
2007-03-20
2007-02-26
tennis2
No

I believe that some of the changes that were made at revisions 31 and 36 should not have been made.

I have started a thread about the changes to rtl8187-newstack/r8187_core.c at https://sourceforge.net/forum/forum.php?thread_id=1676093&forum_id=652149

I also believe that there are problems with ieee80211/ieee80211_softmac.c and rtl818x-newstack/r8180_core.c

I just don't understand why rev 31 replaced ieee80211 queue functions by netif ones (this change was reversed by rev 36).

rev 36 is described as "some patches made by Ubuntu". I have looked at Ubuntu's git tree. The patch that added the rtl drivers is http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=9533d6e292539fae27c6062dbf4ba2b663caaa28

The Ubuntu rtl drivers were updated by these 6 patches
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=a8dc19f626a200ee837af570ce59a732b3094aa5
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=9fe44155276658fad4afab56bd80229bb9b903dc
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=5e330f1f67613ff6d092261c03ba3816a4e9c76d
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=84d69c35b71f8daff106ff50471ee447adaaf6a9
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=0f91ed3ff67c95751252172bb48b5fd96980c71f
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=07e3458bdf5ba97519a58e089841ccb185ede7d2

The Ubuntu rtl drivers were based on drivers in our tree. However, since then our code has been updated (the majority of our changes coming from the latest drivers on Realtek's site).

I don't think the Ubuntu patches haven't been integrated into our tree correctly. My guess is that instead of looking at each Ubuntu patch and applying it to our tree, blocks of code from the latest fully patched Ubuntu's files were copied into our tree. Doing this has incorrectly reversed the updates we have made since the Ubuntu drivers were taken from our tree.

Discussion

  • tennis2
    tennis2
    2007-02-26

    how r8187_core.c should have changed between rev 28 and 36

     
    Attachments
  • tennis2
    tennis2
    2007-02-26

    patch (for rev 53) to reverse changes

     
    Attachments
  • tennis2
    tennis2
    2007-02-26

    Logged In: YES
    user_id=1699179
    Originator: YES

    For the three files (ieee80211_softmac.c, r8187_core.c, r8180_core.c) that have incorrect changes, I have started at their state at rev 30. I then added only the bits of changes in rev 31 and 36 that I think are correct. I then added the changes in all later revisions (53 was the currect rev when I did this) to the files.

    By comparing my 3 files against rev 53, I have produced a patch for rev 53 that reverses the incorrect changes.

    I have built the drivers from this patched rev 53 are running the drivers ass I post this.

    p.s. I see that rev 55 has changed ieee80211_softmac.c again. Therefore my patch cannot be applied against the current rev. I plan to update my patch for the current rev. I'll post it here when I have done so.
    File Added: patch_ubuntu.53

     
  • tennis2
    tennis2
    2007-02-27

    Logged In: YES
    user_id=1699179
    Originator: YES

    I have produced a patch (for ieee80211_softmac.c, r8187_core.c, r8180_core.c) for applying to rev 55.

    Rev 55 is the current rev.
    File Added: patch_ubuntu.55

     
  • tennis2
    tennis2
    2007-02-27

    patch (for rev 55) to reverse changes

     
    Attachments
  • tennis2
    tennis2
    2007-03-20

    • status: open --> closed-fixed