linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Please pull 'libertas' branch of wireless-2.6
@ 2007-03-16 21:38 John W. Linville
  0 siblings, 0 replies; 44+ messages in thread
From: John W. Linville @ 2007-03-16 21:38 UTC (permalink / raw)
  To: jeff; +Cc: linux-wireless

I'm not sure why I still have libertas as a separate branch, but I do.
I don't think this should cause any trouble for you, but I figured
I'd say something in case you were wondering. :-)

Anyway, this is intended for the 'upstream' branch of netdev-2.6.
You already had pulled libertas there when last I checked.

BTW, Pavel's patch is here instead of in another branch because it
depends on changes from the original libertas driver patch.

Thanks,

John

---

The following changes since commit 971a89608a33ab591c85aa00777acd9ad05f9e82:
  John W. Linville (1):
        Merge branch 'from-linus' into libertas

are found in the git repository at:

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

Pavel Roskin (1):
      sparse-annotate radiotap header

Tony Breeds (1):
      libertas: use standard kernel macros

 drivers/net/wireless/libertas/debugfs.c |   41 ++--------------------
 include/net/ieee80211_radiotap.h        |   57 ++++++++++++++++---------------
 2 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 3ad1e03..51dfd20 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1772,8 +1772,8 @@ void libertas_debugfs_remove_one(wlan_private *priv)
 
 /* debug entry */
 
-#define item_size(n) (sizeof ((wlan_adapter *)0)->n)
-#define item_addr(n) ((u32) &((wlan_adapter *)0)->n)
+#define item_size(n)	(FIELD_SIZEOF(wlan_adapter, n))
+#define item_addr(n)	(offsetof(wlan_adapter, n))
 
 struct debug_data {
 	char name[32];
@@ -1789,40 +1789,7 @@ static struct debug_data items[] = {
 	{"psstate", item_size(psstate), item_addr(psstate)},
 };
 
-static int num_of_items = sizeof(items) / sizeof(items[0]);
-
-/**
- *  @brief convert string to number
- *
- *  @param s   	   pointer to numbered string
- *  @return 	   converted number from string s
- */
-static int string_to_number(char *s)
-{
-	int r = 0;
-	int base = 0;
-
-	if ((strncmp(s, "0x", 2) == 0) || (strncmp(s, "0X", 2) == 0))
-		base = 16;
-	else
-		base = 10;
-
-	if (base == 16)
-		s += 2;
-
-	for (s = s; *s != 0; s++) {
-		if ((*s >= 48) && (*s <= 57))
-			r = (r * base) + (*s - 48);
-		else if ((*s >= 65) && (*s <= 70))
-			r = (r * base) + (*s - 55);
-		else if ((*s >= 97) && (*s <= 102))
-			r = (r * base) + (*s - 87);
-		else
-			break;
-	}
-
-	return r;
-}
+static int num_of_items = ARRAY_SIZE(items);
 
 /**
  *  @brief proc read function
@@ -1912,7 +1879,7 @@ static int wlan_debugfs_write(struct file *f, const char __user *buf,
 			if (!p2)
 				break;
 			p2++;
-			r = string_to_number(p2);
+			r = simple_strtoul(p2, NULL, 0);
 			if (d[i].size == 1)
 				*((u8 *) d[i].addr) = (u8) r;
 			else if (d[i].size == 2)
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index c6e0d81..f3bc00e 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -66,7 +66,9 @@
  */
 #define IEEE80211_RADIOTAP_HDRLEN	64
 
-/* The radio capture header precedes the 802.11 header. */
+/* The radio capture header precedes the 802.11 header.
+ * All data in the header is little endian on all platforms.
+ */
 struct ieee80211_radiotap_header {
 	u8 it_version;		/* Version 0. Only increases
 				 * for drastic changes,
@@ -74,12 +76,12 @@ struct ieee80211_radiotap_header {
 				 * new fields does not count.
 				 */
 	u8 it_pad;
-	u16 it_len;		/* length of the whole
+	__le16 it_len;		/* length of the whole
 				 * header in bytes, including
 				 * it_version, it_pad,
 				 * it_len, and data fields.
 				 */
-	u32 it_present;		/* A bitmap telling which
+	__le32 it_present;	/* A bitmap telling which
 				 * fields are present. Set bit 31
 				 * (0x80000000) to extend the
 				 * bitmap by another 32 bits.
@@ -88,104 +90,103 @@ struct ieee80211_radiotap_header {
 				 */
 };
 
-/* Name                                 Data type       Units
- * ----                                 ---------       -----
+/* Name                                 Data type    Units
+ * ----                                 ---------    -----
  *
- * IEEE80211_RADIOTAP_TSFT              u64       microseconds
+ * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *
- * IEEE80211_RADIOTAP_CHANNEL           2 x u16   MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *
- * IEEE80211_RADIOTAP_FHSS              u16       see below
+ * IEEE80211_RADIOTAP_FHSS              __le16       see below
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
- * IEEE80211_RADIOTAP_RATE              u8        500kb/s
+ * IEEE80211_RADIOTAP_RATE              u8           500kb/s
  *
  *      Tx/Rx data rate
  *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      u16       unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    u16       unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u16       decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
- * IEEE80211_RADIOTAP_FLAGS             u8        bitmap
+ * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
- * IEEE80211_RADIOTAP_ANTENNA           u8        antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
- * IEEE80211_RADIOTAP_RX_FLAGS          u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
  *
  *     Properties of received frames. See flags defined below.
  *
- * IEEE80211_RADIOTAP_TX_FLAGS          u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
  *
  *     Properties of transmitted frames. See flags defined below.
  *
- * IEEE80211_RADIOTAP_RTS_RETRIES       u_int8_t        data
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
  *
  *     Number of rts retries a transmitted frame used.
  *
- * IEEE80211_RADIOTAP_DATA_RETRIES      u_int8_t        data
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
  *
  *     Number of unicast retries a transmitted frame used.
  *
- *
- * IEEE80211_RADIOTAP_FCS           	u32       data
+ * IEEE80211_RADIOTAP_FCS           	__le32       data
  *
  *	FCS from frame in network byte order.
  */
-- 
John W. Linville
linville@tuxdriver.com

^ permalink raw reply related	[flat|nested] 44+ messages in thread
* Please pull 'libertas' branch of wireless-2.6
@ 2007-05-11 19:26 John W. Linville
  2007-05-11 20:59 ` Jeff Garzik
  0 siblings, 1 reply; 44+ messages in thread
From: John W. Linville @ 2007-05-11 19:26 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-wireless

[-- Attachment #1: Type: text/plain, Size: 2536 bytes --]

The following changes since commit 1f8a6b658a943b4f04a1fc7b3a420360202c86cd:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../bunk/trivial

are found in the git repository at:

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

Dan Williams (19):
      libertas: remove WPA_SUPPLICANT structure
      libertas: use <net/ieee80211.h> for MAX_WPA_IE_LEN
      libertas: fix size of SSID comparison in stop_adhoc check
      libertas: remove 8021xauthalgs private ioctl
      libertas: remove setauthalg private ioctl
      libertas: remove incorrect vi modelines
      libertas: remove custom encryption mode stuff
      libertas: remove setwpaie private ioctl
      libertas: remove WLAN_802_11_AUTHENTICATION_MODE
      libertas: remove WLAN_802_11_WEP_STATUS enum
      libertas: remove WLAN_802_11_NETWORK_INFRASTRUCTURE enum
      libertas: Get rid of version.h
      libertas: Purge non-mesh ioctls
      libertas: remove SUPPORT_BOOT_COMMAND
      libertas: Clean up debug defines
      libertas: make debugfs.c sparse-clean
      libertas: fix missing unlock in TX error path
      libertas: sparse fixes
      libertas: 64-bit cleanups

 drivers/net/wireless/libertas/Makefile  |    9 -
 drivers/net/wireless/libertas/README    |  516 -----------
 drivers/net/wireless/libertas/assoc.c   |   41 +-
 drivers/net/wireless/libertas/cmd.c     |   23 +-
 drivers/net/wireless/libertas/cmdresp.c |    4 +-
 drivers/net/wireless/libertas/debugfs.c |   31 +-
 drivers/net/wireless/libertas/defs.h    |   52 +-
 drivers/net/wireless/libertas/dev.h     |   14 +-
 drivers/net/wireless/libertas/fw.c      |    9 +-
 drivers/net/wireless/libertas/if_usb.c  |    5 +-
 drivers/net/wireless/libertas/if_usb.h  |    2 -
 drivers/net/wireless/libertas/ioctl.c   | 1529 +------------------------------
 drivers/net/wireless/libertas/join.c    |  194 +----
 drivers/net/wireless/libertas/join.h    |    7 -
 drivers/net/wireless/libertas/main.c    |    7 +
 drivers/net/wireless/libertas/rx.c      |    4 +-
 drivers/net/wireless/libertas/scan.c    |  203 ++---
 drivers/net/wireless/libertas/scan.h    |   22 +-
 drivers/net/wireless/libertas/tx.c      |    2 +-
 drivers/net/wireless/libertas/version.h |    7 -
 drivers/net/wireless/libertas/wext.c    |  448 +--------
 drivers/net/wireless/libertas/wext.h    |   85 --
 22 files changed, 259 insertions(+), 2955 deletions(-)

Omnibus diff attached as "libertas-cleanups.patch.bz2" due to size concerns.

-- 
John W. Linville
linville@tuxdriver.com

[-- Attachment #2: libertas-cleanups.patch.bz2 --]
[-- Type: application/x-bzip2, Size: 24407 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread
[parent not found: <20070529183347.GD3496@tuxdriver.com>]
end of thread, other threads:[~2007-06-01 21:44 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20070227205649.GH5826@tuxdriver.com>
2007-02-28  1:01 ` Please pull 'libertas' branch of wireless-2.6 John W. Linville
2007-03-03  1:29 ` Jeff Garzik
2007-03-03  5:21   ` Christoph Hellwig
2007-03-04 15:36     ` Marcelo Tosatti
2007-03-05 14:08       ` Christoph Hellwig
2007-03-07 18:16         ` Marcelo Tosatti
2007-03-07 22:24           ` Christoph Hellwig
2007-03-08  2:40             ` Dan Williams
2007-03-08  8:31               ` Christoph Hellwig
2007-03-08 14:06               ` Michael Buesch
2007-05-07 10:41     ` Christoph Hellwig
2007-05-07 12:03       ` Dan Williams
2007-05-07 14:11         ` Please pull 'revert-libertas' branch of wireless-2.6 (was Re: Please pull 'libertas' branch of wireless-2.6) John W. Linville
2007-05-07 15:22           ` Jeff Garzik
2007-05-07 15:38             ` John W. Linville
2007-05-07 15:47             ` Dan Williams
2007-05-07 15:48               ` Jeff Garzik
2007-05-07 16:44                 ` John W. Linville
2007-05-08  6:12             ` Matt Mackall
2007-05-08  8:28               ` Nick Piggin
2007-05-08 20:59                 ` Jeff Garzik
2007-05-08 23:31                   ` Nick Piggin
2007-05-08  9:47             ` Pekka Enberg
2007-05-08 20:27               ` Please pull 'revert-libertas' branch of wireless-2.6 David Miller
2007-05-08 20:55                 ` Jeff Garzik
2007-05-08 21:29                   ` Dan Williams
2007-05-08 22:40                     ` Jeff Garzik
2007-05-08 23:41                       ` Marcelo Tosatti
2007-05-09  1:27                         ` Dan Williams
2007-05-09 21:25                           ` Randy Dunlap
2007-05-09 21:41                             ` Dan Williams
2007-05-09 21:41                               ` Jeff Garzik
2007-05-10 18:35                                 ` Dan Williams
2007-05-09 21:46                               ` Randy Dunlap
2007-05-10 16:56                                 ` Dan Williams
2007-05-10 20:48                                   ` Dan Williams
2007-03-16 21:38 Please pull 'libertas' " John W. Linville
  -- strict thread matches above, loose matches on Subject: below --
2007-05-11 19:26 John W. Linville
2007-05-11 20:59 ` Jeff Garzik
     [not found] <20070529183347.GD3496@tuxdriver.com>
2007-05-30 14:07 ` Jeff Garzik
2007-05-30 15:28   ` Dan Williams
2007-05-31 21:13     ` Dan Williams
2007-05-31 21:16       ` John W. Linville
2007-06-01 21:48         ` Dan Williams

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).