Update compat.diff to apply cleanly
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 3 Nov 2008 17:55:54 +0000 (09:55 -0800)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 3 Nov 2008 17:55:54 +0000 (09:55 -0800)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
compat/compat.diff

index dfb8486e50e4fcbee3f874425c19931e59e84961..ede81f95d4910321705f72f32d65c64a4aae96a3 100644 (file)
@@ -139,11 +139,9 @@ index 842a08d..079c1fd 100644
        {
                lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
                goto out1;
-diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index fa0cc7a..3987576 100644
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -432,6 +432,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
+--- a/net/mac80211/main.c      2008-11-03 09:54:12.000000000 -0800
++++ b/net/mac80211/main.c      2008-11-03 09:54:13.000000000 -0800
+@@ -423,6 +423,7 @@
                return;
        }
  
@@ -151,7 +149,7 @@ index fa0cc7a..3987576 100644
        if (!test_sta_flags(sta, WLAN_STA_PS) && !skb->requeue) {
                /* Software retry the packet once */
                skb->requeue = 1;
-@@ -439,6 +440,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
+@@ -430,6 +431,7 @@
                dev_queue_xmit(skb);
                return;
        }