Linux Driver Project development and general discussion ()

Brett Rudley | 1 Oct 2010 06:09

RE: [PATCH] staging: brcm80211: move #includes from .h to .c's

Greg

Please ignore this patch, it needs to be broken down into two separate patches.
Sorry, will resubmit.

Brett

> -----Original Message-----
> From: Brett Rudley [mailto:brudley <at> broadcom.com]
> Sent: Thursday, September 30, 2010 9:00 PM
> To: greg <at> kroah.com
> Cc: Brett Rudley; devel <at> linuxdriverproject.org; Henry Ptasinski; Nohee Ko
> Subject: [PATCH] staging: brcm80211: move #includes from .h to .c's
>
> Move #include's out of linux_osl.h and into individual C files.
> For softmac only right now, fullmac still to be done.
>
> Signed-off-by: Brett Rudley <brudley <at> broadcom.com>
> ---
>  drivers/staging/brcm80211/include/linux_osl.h   |    8 ++++++++
>  drivers/staging/brcm80211/phy/wlc_phy_cmn.c     |    3 +++
>  drivers/staging/brcm80211/phy/wlc_phy_lcn.c     |    3 +++
>  drivers/staging/brcm80211/phy/wlc_phy_n.c       |    4 ++++
>  drivers/staging/brcm80211/sys/wl_mac80211.c     |   20 -----------------
> ---
>  drivers/staging/brcm80211/sys/wlc_alloc.c       |   10 +++-------
>  drivers/staging/brcm80211/sys/wlc_ampdu.c       |    4 +---
>  drivers/staging/brcm80211/sys/wlc_antsel.c      |    8 ++------
>  drivers/staging/brcm80211/sys/wlc_bmac.c        |    1 +
>  drivers/staging/brcm80211/sys/wlc_channel.c     |    3 +++

(Continue reading)

Henry Ptasinski | 1 Oct 2010 03:13

Re: [PATCH 0/9 v4] staging: brcm80211: fix assignments in if conditon

Greg,

This patch series also pases my smoke test.

- Henry

Henry Ptasinski
henryp <at> broadcom.com

----- Original Message -----
From: Jason Cooper <jason <at> lakedaemon.net>
To: joe <at> perches.com <joe <at> perches.com>; greg <at> kroah.com <greg <at> kroah.com>; Henry Ptasinski
Cc: devel <at> linuxdriverproject.org <devel <at> linuxdriverproject.org>; Jason Cooper <jason <at> lakedaemon.net>
Sent: Thu Sep 30 12:15:32 2010
Subject: [PATCH 0/9 v4] staging: brcm80211: fix assignments in if conditon

All,

This version of the series implements Joe's recommendations in patch 8
(wl_iw.c).

Previously fixed are Greg's removal of a Module.symvers, and Henry's 
revert in dhd_linux.c

thx,

Jason.

Jason Cooper (9):
  staging: brcm80211: fix checkpatch error 'assignment in if condition'

(Continue reading)

Brett Rudley | 1 Oct 2010 06:00

[PATCH] staging: brcm80211: move #includes from .h to .c's

Move #include's out of linux_osl.h and into individual C files. 
For softmac only right now, fullmac still to be done.

Signed-off-by: Brett Rudley <brudley <at> broadcom.com>
---
 drivers/staging/brcm80211/include/linux_osl.h   |    8 ++++++++
 drivers/staging/brcm80211/phy/wlc_phy_cmn.c     |    3 +++
 drivers/staging/brcm80211/phy/wlc_phy_lcn.c     |    3 +++
 drivers/staging/brcm80211/phy/wlc_phy_n.c       |    4 ++++
 drivers/staging/brcm80211/sys/wl_mac80211.c     |   20 --------------------
 drivers/staging/brcm80211/sys/wlc_alloc.c       |   10 +++-------
 drivers/staging/brcm80211/sys/wlc_ampdu.c       |    4 +---
 drivers/staging/brcm80211/sys/wlc_antsel.c      |    8 ++------
 drivers/staging/brcm80211/sys/wlc_bmac.c        |    1 +
 drivers/staging/brcm80211/sys/wlc_channel.c     |    3 +++
 drivers/staging/brcm80211/sys/wlc_event.c       |    4 ++--
 drivers/staging/brcm80211/sys/wlc_mac80211.c    |    6 ++----
 drivers/staging/brcm80211/sys/wlc_phy_shim.c    |    2 ++
 drivers/staging/brcm80211/sys/wlc_rate.c        |    2 ++
 drivers/staging/brcm80211/sys/wlc_stf.c         |    2 ++
 drivers/staging/brcm80211/util/aiutils.c        |    3 +++
 drivers/staging/brcm80211/util/bcmotp.c         |    3 +++
 drivers/staging/brcm80211/util/bcmsrom.c        |    2 ++
 drivers/staging/brcm80211/util/bcmutils.c       |    2 ++
 drivers/staging/brcm80211/util/bcmwpa.c         |    4 ++++
 drivers/staging/brcm80211/util/hnddma.c         |    3 +++
 drivers/staging/brcm80211/util/hndpmu.c         |    2 ++
 drivers/staging/brcm80211/util/nicpci.c         |    2 ++
 drivers/staging/brcm80211/util/nvram/nvram_ro.c |    1 +
 drivers/staging/brcm80211/util/siutils.c        |    3 +++

(Continue reading)

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 4/6] staging: brcm80211: Remove unnecessary debug print routines.

Removed several unused and rarely used debug printout routines that look into
portions of the frame that are more properly left to the mac80211 stack.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/sys/wlc_mac80211.c |  380 --------------------------
 1 files changed, 0 insertions(+), 380 deletions(-)

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index f6cb555..2a4e68f 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
 <at>  <at>  -274,10 +274,6  <at>  <at>  static int wlc_iovar_rangecheck(wlc_info_t *wlc, uint32 val,
 				const bcm_iovar_t *vi);
 static uint8 wlc_local_constraint_qdbm(wlc_info_t *wlc);

-#if defined(BCMDBG)
-static void wlc_print_dot11hdr(uint8 *buf, int len);
-#endif
-
 /* send and receive */
 static wlc_txq_info_t *wlc_txq_alloc(wlc_info_t *wlc, osl_t *osh);
 static void wlc_txq_free(wlc_info_t *wlc, osl_t *osh, wlc_txq_info_t *qi);
 <at>  <at>  -332,7 +328,6  <at>  <at>  static uint wlc_down_del_timer(wlc_info_t *wlc);
 static void wlc_ofdm_rateset_war(wlc_info_t *wlc);
 static int _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len,
 		      struct wlc_if *wlcif);
-char *print_fk(uint16 fk);

 #if defined(BCMDBG)

(Continue reading)

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 0/6] staging: brcm80211: Cleanup include/proto/802.11.h

Patches to clean out a lot of the include/proto/802.11.h header file, and
related cleanup of a few other files to eliminate dependencies on stuff that's
being deletd.

A followup task is to replace much of what's left in the header file with the
appropriate equivalents from include/linux/ieee80211.h.

---
Henry Ptasinski
henryp <at> broadcom.com

Henry Ptasinski (6):
  staging: brcm80211: Remove unused structure.
  staging: brcm80211: Remove unnecessary assertions.
  staging: brcm80211: Remove unused field from wlc_info structure.
  staging: brcm80211: Remove unnecessary debug print routines.
  staging: brcm80211: Remove unnecessary assertions.
  staging: brcm80211: Remove unneeded definitions and structures.

 drivers/staging/brcm80211/include/proto/802.11.h | 1115 +---------------------
 drivers/staging/brcm80211/include/wlioctl.h      |    9 -
 drivers/staging/brcm80211/sys/wlc_ampdu.c        |    6 -
 drivers/staging/brcm80211/sys/wlc_mac80211.c     |  388 --------
 drivers/staging/brcm80211/sys/wlc_mac80211.h     |    1 -
 5 files changed, 3 insertions(+), 1516 deletions(-)

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 6/6] staging: brcm80211: Remove unneeded definitions and structures.

Remove definitions and structures that are no longer needed.  Most of the
remaining ones can probably be replaced with the equivalent ones from
include/linux/ieee80211.h.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/include/proto/802.11.h | 1115 +---------------------
 1 files changed, 3 insertions(+), 1112 deletions(-)

diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h
index 04570e8..ef40ff2 100644
--- a/drivers/staging/brcm80211/include/proto/802.11.h
+++ b/drivers/staging/brcm80211/include/proto/802.11.h
 <at>  <at>  -21,45 +21,22  <at>  <at> 
 #include <typedefs.h>
 #endif

-#ifndef _NET_ETHERNET_H_
-#include <proto/ethernet.h>
-#endif
-
 #include <proto/wpa.h>

 #include <packed_section_start.h>

-#define DOT11_TU_TO_US			1024
-
 #define DOT11_A3_HDR_LEN		24
 #define DOT11_A4_HDR_LEN		30
 #define DOT11_MAC_HDR_LEN		DOT11_A3_HDR_LEN

(Continue reading)

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 5/6] staging: brcm80211: Remove unnecessary assertions.

Remove assertions on the size of several structures.  These structures are
never used anywhere.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/sys/wlc_mac80211.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 2a4e68f..fed751b 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
 <at>  <at>  -1788,22 +1788,14  <at>  <at>  void *BCMATTACHFN(wlc_attach) (void *wl, uint16 vendor, uint16 device,
 	ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN);
 	ASSERT(sizeof(d11txh_t) == D11_TXH_LEN);
 	ASSERT(sizeof(d11rxhdr_t) == RXHDR_LEN);
-	ASSERT(sizeof(struct dot11_llc_snap_header) == DOT11_LLC_SNAP_HDR_LEN);
 	ASSERT(sizeof(struct dot11_header) == DOT11_A4_HDR_LEN);
 	ASSERT(sizeof(struct dot11_rts_frame) == DOT11_RTS_LEN);
-	ASSERT(sizeof(struct dot11_cts_frame) == DOT11_CTS_LEN);
-	ASSERT(sizeof(struct dot11_ack_frame) == DOT11_ACK_LEN);
-	ASSERT(sizeof(struct dot11_ps_poll_frame) == DOT11_PS_POLL_LEN);
-	ASSERT(sizeof(struct dot11_cf_end_frame) == DOT11_CS_END_LEN);
 	ASSERT(sizeof(struct dot11_management_header) == DOT11_MGMT_HDR_LEN);
-	ASSERT(sizeof(struct dot11_auth) == DOT11_AUTH_FIXED_LEN);
 	ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN);
 	ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);
-	ASSERT(sizeof(ht_add_ie_t) == HT_ADD_IE_LEN);
 	ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN);
 	ASSERT(OFFSETOF(wl_scan_params_t, channel_list) ==

(Continue reading)

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 2/6] staging: brcm80211: Remove unnecessary assertions.

Remove assertions on the size of several structures.  These structures are
never used anywhere.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/sys/wlc_ampdu.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index d2eab6a..aa56d99 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
 <at>  <at>  -175,12 +175,6  <at>  <at>  ampdu_info_t *BCMATTACHFN(wlc_ampdu_attach) (wlc_info_t *wlc)
 	int i;

 	/* some code depends on packed structures */
-	ASSERT(sizeof(struct dot11_bar) == DOT11_BAR_LEN);
-	ASSERT(sizeof(struct dot11_ba) == DOT11_BA_LEN + DOT11_BA_BITMAP_LEN);
-	ASSERT(sizeof(struct dot11_ctl_header) == DOT11_CTL_HDR_LEN);
-	ASSERT(sizeof(struct dot11_addba_req) == DOT11_ADDBA_REQ_LEN);
-	ASSERT(sizeof(struct dot11_addba_resp) == DOT11_ADDBA_RESP_LEN);
-	ASSERT(sizeof(struct dot11_delba) == DOT11_DELBA_LEN);
 	ASSERT(DOT11_MAXNUMFRAGS == NBITS(uint16));
 	ASSERT(ISPOWEROF2(AMPDU_TX_BA_MAX_WSIZE));
 	ASSERT(ISPOWEROF2(AMPDU_RX_BA_MAX_WSIZE));
--

-- 
1.6.3.3

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 3/6] staging: brcm80211: Remove unused field from wlc_info structure.

Remove an unused field from the wlc_info structure, so that the underlying
structure can also be cleaned up.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/sys/wlc_mac80211.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h
index cf6ce42..9ef8460 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h
 <at>  <at>  -713,7 +713,6  <at>  <at>  struct wlc_info {
 	int8 ofdm_40txbw;	/* 11N, ofdm tx b/w override when in 40MHZ mode */
 	int8 mimo_40txbw;	/* 11N, mimo tx b/w override when in 40MHZ mode */
 	ht_cap_ie_t ht_cap;	/* HT CAP IE being advertised by this node */
-	ht_add_ie_t ht_add;	/* HT ADD IE being used by this node */

 	uint seckeys;		/* 54 key table shm address */
 	uint tkmickeys;		/* 12 TKIP MIC key table shm address */
--

-- 
1.6.3.3

Henry Ptasinski | 1 Oct 2010 23:05

[PATCH 1/6] staging: brcm80211: Remove unused structure.

Remove the wl_assoc_info_t structure.  It's never used, and depends on
structures defined in other header files that can now also be cleaned up.

Signed-off-by: Henry Ptasinski <henryp <at> broadcom.com>
---
 drivers/staging/brcm80211/include/wlioctl.h |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
index 554316c..0ac7a61 100644
--- a/drivers/staging/brcm80211/include/wlioctl.h
+++ b/drivers/staging/brcm80211/include/wlioctl.h
 <at>  <at>  -622,15 +622,6  <at>  <at>  typedef struct wl_led_info {
 	uint8 activehi;
 } wl_led_info_t;

-typedef struct wl_assoc_info {
-	uint32 req_len;
-	uint32 resp_len;
-	uint32 flags;
-	struct dot11_assoc_req req;
-	struct ether_addr reassoc_bssid;	/* used in reassoc's */
-	struct dot11_assoc_resp resp;
-} wl_assoc_info_t;
-
 /* flags */
 #define WLC_ASSOC_REQ_IS_REASSOC 0x01	/* assoc req was actually a reassoc */

--

-- 
1.6.3.3

(Continue reading)

Group

gmane.linux.drivers.driver-project.devel.

Project Web Page

Linux Driver Project development and general discussion ()

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 58

Articles in period: 571

October 2010

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

hello (17 May 2013)
[PATCH] staging/xgifb: Remove dead assignments/increments (18 May 2013)
[PATCH 1/2] staging/btmtk_usb: use module_usb_driver to register drive (17 May 2013)
[PATCH 5/6] staging: comedi: me_daq: use comedi_load_firmware() (17 May 2013)
[PATCH 6/6] staging: comedi: ni_pcidio: use comedi_load_firmware() (17 May 2013)
[PATCH 4/6] staging: comedi: daqboard2000: use comedi_load_firmware() (17 May 2013)
[PATCH 3/6] staging: comedi: drivers: generalize comedi_load_firmware( (17 May 2013)
[PATCH 2/6] staging: comedi: jr3_pci: tidy up comedi_load_firmware() (17 May 2013)
[PATCH 1/6] staging: comedi: jr3_pci: use kasprintf (17 May 2013)
[PATCH 0/6] staging: comedi: export comedi_load_firmware() (17 May 2013)
[PATCH 1/1] Staging: bcm: Fix of various code style issues. (17 May 2013)
[PATCH] staging/solo6x10: select the desired font (17 May 2013)
[PATCH -next] staging: wlags49_h2: fix error return code in wl_adapter (17 May 2013)
[PATCH -next] staging: lustre: fix to use list_for_each_entry_safe() w (17 May 2013)
vme_tsi148 & vme_user driver questions (17 May 2013)
Photo Retouching Services - Photo Cut Out - Photo Editing (17 May 2013)
[PATCH] Staging: wlan-ng: Replace printk with pr_ to fix checkpatch wa (17 May 2013)
[PATCH 2/2] Staging: android: sync: use seq_puts()/seq_putc() to follo (16 May 2013)
[PATCH] Staging: android: sync: fixed a brace coding style issue (16 May 2013)
[PATCH] staging: lustre: fix return type of lo_release. (16 May 2013)
[PATCH] staging: Swap zram and zsmalloc in Kconfig (16 May 2013)

Archives

496	May 2013
678	April 2013
875	March 2013
631	February 2013
815	January 2013
399	December 2012
1126	November 2012
879	October 2012
1323	September 2012
608	August 2012
966	July 2012
1010	June 2012
1037	May 2012
582	April 2012
372	March 2012
449	February 2012
431	January 2012
514	December 2011
660	November 2011
640	October 2011
630	September 2011
1147	August 2011
622	July 2011
449	June 2011
828	May 2011
550	April 2011
1663	March 2011
744	February 2011
1080	January 2011
459	December 2010
464	November 2010
571	October 2010
587	September 2010
814	August 2010
314	July 2010
518	June 2010
1161	May 2010
406	April 2010
979	March 2010
301	February 2010
162	January 2010
450	December 2009
188	November 2009
303	October 2009
970	September 2009
203	August 2009
255	July 2009
436	June 2009
21	May 2009
9	April 2009
14	March 2009
4	February 2009
14	January 2009
10	December 2008
13	November 2008
14	October 2008
12	September 2008
41	August 2008
16	July 2008
68	June 2008
28	May 2008
60	April 2008
13	March 2008
15	February 2008
8	January 2008
54	November 2007
239	October 2007
37	September 2007
1	July 2007

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template