Subject: Please pull 'libertas-fixes' branch of wireless-2.6

From: "John W. Linville" <[email-masked]>
Date: Tue, 3 Jul 2007 14:48:13 -0400

The following changes since commit aa2e09da2a332e748532aa2a71b090e7e7c3203d:
  Len Brown (1):
        ACPI: fix acpi_osi=!Linux

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-fixes

Holger Schurig (1):
      libertas: fix use-after-free in rx path

Robert P. J. Day (1):
      WIRELESS: Remove clearly obsolete libertas/version.h file.

 drivers/net/wireless/libertas/rx.c      |    1 -
 drivers/net/wireless/libertas/version.h |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 drivers/net/wireless/libertas/version.h

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 88d9d2d..769c86f 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -439,7 +439,6 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb)
 	ret = 0;
 
 done:
-	skb->protocol = __constant_htons(0x0019);	/* ETH_P_80211_RAW */
 	lbs_deb_leave_args(LBS_DEB_RX, "ret %d", ret);
 	return ret;
 }
diff --git a/drivers/net/wireless/libertas/version.h b/drivers/net/wireless/libertas/version.h
deleted file mode 100644
index 8b13789..0000000
--- a/drivers/net/wireless/libertas/version.h
+++ /dev/null
@@ -1 +0,0 @@
-

-- 
John W. Linville
[email-masked]