Commit 60f5f3fb authored by Juliana Rodrigues's avatar Juliana Rodrigues Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: renames hfa384x_InfFrame to avoid camelcase 



Renames hfa384x_InfFrame to hfa384x_inf_frame in order to fix a
checkpatch error caused by camelcase.

Signed-off-by: default avatarJuliana Rodrigues <juliana.orod@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12300532

drivers/staging/wlan-ng/hfa384x.h

+3 −3
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ union hfa384x_infodata { 
	struct hfa384x_KeyIDChanged keyidchanged;

} __packed;



struct hfa384x_InfFrame {

struct hfa384x_inf_frame {

	u16 framelen;

	u16 infotype;

	union hfa384x_infodata info;
@@ -862,7 +862,7 @@ struct hfa384x_usb_rxfrm { 


struct hfa384x_usb_infofrm {

	u16 type;

	struct hfa384x_InfFrame info;

	struct hfa384x_inf_frame info;

} __packed;



struct hfa384x_usb_statusresp {
@@ -1370,7 +1370,7 @@ struct hfa384x { 
		struct hfa384x_ChInfoResult results;

	} channel_info;



	struct hfa384x_InfFrame *scanresults;

	struct hfa384x_inf_frame *scanresults;



	struct prism2sta_authlist authlist;	/* Authenticated station list. */

	unsigned int accessmode;		/* Access mode. */

drivers/staging/wlan-ng/prism2mgmt.h

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ extern int prism2_reset_settletime; 


u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate);



void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf);

void prism2sta_ev_info(struct wlandevice *wlandev,

		       struct hfa384x_inf_frame *inf);

void prism2sta_ev_txexc(struct wlandevice *wlandev, u16 status);

void prism2sta_ev_tx(struct wlandevice *wlandev, u16 status);

void prism2sta_ev_alloc(struct wlandevice *wlandev);

drivers/staging/wlan-ng/prism2sta.c

+25 −24
Original line number Diff line number Diff line
@@ -112,25 +112,25 @@ static int prism2sta_setmulticast(struct wlandevice *wlandev, 
				  struct net_device *dev);



static void prism2sta_inf_handover(struct wlandevice *wlandev,

				   struct hfa384x_InfFrame *inf);

				   struct hfa384x_inf_frame *inf);

static void prism2sta_inf_tallies(struct wlandevice *wlandev,

				  struct hfa384x_InfFrame *inf);

				  struct hfa384x_inf_frame *inf);

static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,

					  struct hfa384x_InfFrame *inf);

					  struct hfa384x_inf_frame *inf);

static void prism2sta_inf_scanresults(struct wlandevice *wlandev,

				      struct hfa384x_InfFrame *inf);

				      struct hfa384x_inf_frame *inf);

static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,

					struct hfa384x_InfFrame *inf);

					struct hfa384x_inf_frame *inf);

static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,

				     struct hfa384x_InfFrame *inf);

				     struct hfa384x_inf_frame *inf);

static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,

				      struct hfa384x_InfFrame *inf);

				      struct hfa384x_inf_frame *inf);

static void prism2sta_inf_authreq(struct wlandevice *wlandev,

				  struct hfa384x_InfFrame *inf);

				  struct hfa384x_inf_frame *inf);

static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,

					struct hfa384x_InfFrame *inf);

					struct hfa384x_inf_frame *inf);

static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,

				    struct hfa384x_InfFrame *inf);

				    struct hfa384x_inf_frame *inf);



/*

 * prism2sta_open
@@ -964,7 +964,7 @@ static int prism2sta_setmulticast(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_handover(struct wlandevice *wlandev,

				   struct hfa384x_InfFrame *inf)

				   struct hfa384x_inf_frame *inf)

{

	pr_debug("received infoframe:HANDOVER (unhandled)\n");

}
@@ -987,7 +987,7 @@ static void prism2sta_inf_handover(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_tallies(struct wlandevice *wlandev,

				  struct hfa384x_InfFrame *inf)

				  struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	u16 *src16;
@@ -1033,7 +1033,7 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_scanresults(struct wlandevice *wlandev,

				      struct hfa384x_InfFrame *inf)

				      struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	int nbss;
@@ -1088,7 +1088,7 @@ static void prism2sta_inf_scanresults(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,

					  struct hfa384x_InfFrame *inf)

					  struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	int nbss;
@@ -1101,7 +1101,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev, 


	kfree(hw->scanresults);



	hw->scanresults = kmemdup(inf, sizeof(struct hfa384x_InfFrame),

	hw->scanresults = kmemdup(inf, sizeof(struct hfa384x_inf_frame),

				  GFP_ATOMIC);



	if (nbss == 0)
@@ -1130,7 +1130,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,

					struct hfa384x_InfFrame *inf)

					struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	unsigned int i, n;
@@ -1182,10 +1182,10 @@ void prism2sta_processing_defer(struct work_struct *data) 
	/* First let's process the auth frames */

	{

		struct sk_buff *skb;

		struct hfa384x_InfFrame *inf;

		struct hfa384x_inf_frame *inf;



		while ((skb = skb_dequeue(&hw->authq))) {

			inf = (struct hfa384x_InfFrame *)skb->data;

			inf = (struct hfa384x_inf_frame *)skb->data;

			prism2sta_inf_authreq_defer(wlandev, inf);

		}
@@ -1443,7 +1443,7 @@ void prism2sta_processing_defer(struct work_struct *data) 
 *	interrupt

 */

static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,

				     struct hfa384x_InfFrame *inf)

				     struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;
@@ -1471,7 +1471,7 @@ static void prism2sta_inf_linkstatus(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,

				      struct hfa384x_InfFrame *inf)

				      struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	struct hfa384x_AssocStatus rec;
@@ -1532,7 +1532,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev, 
 *

 */

static void prism2sta_inf_authreq(struct wlandevice *wlandev,

				  struct hfa384x_InfFrame *inf)

				  struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	struct sk_buff *skb;
@@ -1547,7 +1547,7 @@ static void prism2sta_inf_authreq(struct wlandevice *wlandev, 
}



static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,

					struct hfa384x_InfFrame *inf)

					struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;

	struct hfa384x_authenticateStation_data rec;
@@ -1721,7 +1721,7 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev, 
 *	interrupt

 */

static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,

				    struct hfa384x_InfFrame *inf)

				    struct hfa384x_inf_frame *inf)

{

	struct hfa384x *hw = wlandev->priv;
@@ -1745,7 +1745,8 @@ static void prism2sta_inf_psusercnt(struct wlandevice *wlandev, 
 * Call context:

 *	interrupt

 */

void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf)

void prism2sta_ev_info(struct wlandevice *wlandev,

		       struct hfa384x_inf_frame *inf)

{

	inf->infotype = le16_to_cpu(inf->infotype);

	/* Dispatch */