problem applying Atheros patch

[Patton Echols <p echols comcast net>]

Some time ago I wrote the list about using Network Manager with atheros 
/ madwifi driver and the signal strength reporting problem with the 
driver.  Even though it is not supposed to make a difference, NM 
periodically drops connection and I have been told that others in this 
position have seen better results after patching. 

Last time I posted, I was pointed to the patches posted here:
http://mail.gnome.org/archives/networkmanager-list/2006-January/msg00141.html

Since I'm kind of a Noob, it took me a while to fine out what I'm supposed to do with a patch. 

I am using Network Manager on Ubuntu 6.10 (Edgy) with Atheros chipset.  NM version is 0.6.3.

At the point of applying the patch, i get the following output from the patch command:

patton Mycroft:~/NetworkManager/network-manager-0.6.3$ patch -p0  < atheros.patch
patching file src/nm-device-802-11-wireless.c
Hunk #1 succeeded at 117 (offset -4 lines).
Hunk #2 succeeded at 1152 (offset 134 lines).
Hunk #3 succeeded at 1248 (offset 134 lines).
Hunk #4 FAILED at 1308.
Hunk #5 succeeded at 3309 with fuzz 1 (offset 114 lines).
1 out of 5 hunks FAILED -- saving rejects to file 
src/nm-device-802-11-wireless.c.rej

=======================

And here is the contents of file src/nm-device-802-11-wireless.c.rej

***************
*** 1306,1312 ****
 #endif
         if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, 
&range, has_range) == 0)
         {
-             percent = wireless_qual_to_percent (&stats.qual, (const 
iwqual *)(&self->priv->max_qual),
                     (const iwqual *)(&self->priv->avg_qual));
         }
         nm_dev_sock_close (sk);
--- 1308,1314 ----
 #endif
         if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, 
&range, has_range) == 0)
         {
+             percent = wireless_qual_to_percent (NM_DEVICE (self), 
&stats.qual, (const iwqual *)(&self->priv->max_qual),
                     (const iwqual *)(&self->priv->avg_qual));
         }
         nm_dev_sock_close (sk);

I stopped at this point.  I really don't want to carry on building the code if the patch won't work.  Any 
thoughts?  

Thanks for all thoughts,

Patton