Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9573a8d authored by sayli karnik's avatar sayli karnik Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: Remove the typedef to the 'wlandevice' structure 



This patch removes the typedef 'wlandevice_t' to the 'wlandevice'
structure.

Signed-off-by: default avatarsayli karnik <karniksayli1995@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbb351cc

drivers/staging/wlan-ng/cfg80211.c

+19 −19
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static const u32 prism2_cipher_suites[PRISM2_NUM_CIPHER_SUITES] = { 


/* prism2 device private data */

struct prism2_wiphy_private {

	wlandevice_t *wlandev;

	struct wlandevice *wlandev;



	struct ieee80211_supported_band band;

	struct ieee80211_channel channels[ARRAY_SIZE(prism2_channels)];
@@ -69,7 +69,7 @@ static int prism2_result2err(int prism2_result) 
	return err;

}



static int prism2_domibset_uint32(wlandevice_t *wlandev, u32 did, u32 data)

static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 data)

{

	struct p80211msg_dot11req_mibset msg;

	p80211item_uint32_t *mibitem =
@@ -82,7 +82,7 @@ static int prism2_domibset_uint32(wlandevice_t *wlandev, u32 did, u32 data) 
	return p80211req_dorequest(wlandev, (u8 *)&msg);

}



static int prism2_domibset_pstr32(wlandevice_t *wlandev,

static int prism2_domibset_pstr32(struct wlandevice *wlandev,

				  u32 did, u8 len, const u8 *data)

{

	struct p80211msg_dot11req_mibset msg;
@@ -103,7 +103,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy, 
				      enum nl80211_iftype type, u32 *flags,

				      struct vif_params *params)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	u32 data;

	int result;

	int err = 0;
@@ -144,7 +144,7 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, 
			  u8 key_index, bool pairwise, const u8 *mac_addr,

			  struct key_params *params)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	u32 did;



	int err = 0;
@@ -188,7 +188,7 @@ static int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, 
			  const u8 *mac_addr, void *cookie,

			  void (*callback)(void *cookie, struct key_params*))

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	struct key_params params;

	int len;
@@ -216,7 +216,7 @@ static int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, 
static int prism2_del_key(struct wiphy *wiphy, struct net_device *dev,

			  u8 key_index, bool pairwise, const u8 *mac_addr)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	u32 did;

	int err = 0;

	int result = 0;
@@ -241,7 +241,7 @@ static int prism2_del_key(struct wiphy *wiphy, struct net_device *dev, 
static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,

				  u8 key_index, bool unicast, bool multicast)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;



	int err = 0;

	int result = 0;
@@ -259,7 +259,7 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, 
static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,

			      const u8 *mac, struct station_info *sinfo)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	struct p80211msg_lnxreq_commsquality quality;

	int result;
@@ -294,7 +294,7 @@ static int prism2_scan(struct wiphy *wiphy, 
{

	struct net_device *dev;

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev;

	struct wlandevice *wlandev;

	struct p80211msg_dot11req_scan msg1;

	struct p80211msg_dot11req_scan_results msg2;

	struct cfg80211_bss *bss;
@@ -411,7 +411,7 @@ static int prism2_scan(struct wiphy *wiphy, 
static int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed)

{

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev = priv->wlandev;

	struct wlandevice *wlandev = priv->wlandev;

	u32 data;

	int result;

	int err = 0;
@@ -453,7 +453,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed) 
static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,

			  struct cfg80211_connect_params *sme)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	struct ieee80211_channel *channel = sme->channel;

	struct p80211msg_lnxreq_autojoin msg_join;

	u32 did;
@@ -563,7 +563,7 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, 
static int prism2_disconnect(struct wiphy *wiphy, struct net_device *dev,

			     u16 reason_code)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	struct p80211msg_lnxreq_autojoin msg_join;

	int result;

	int err = 0;
@@ -597,7 +597,7 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, 
			       enum nl80211_tx_power_setting type, int mbm)

{

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev = priv->wlandev;

	struct wlandevice *wlandev = priv->wlandev;

	u32 data;

	int result;

	int err = 0;
@@ -624,7 +624,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, 
			       int *dbm)

{

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev = priv->wlandev;

	struct wlandevice *wlandev = priv->wlandev;

	struct p80211msg_dot11req_mibget msg;

	p80211item_uint32_t *mibitem;

	int result;
@@ -649,7 +649,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, 
}



/* Interface callback functions, passing data back up to the cfg80211 layer */

void prism2_connect_result(wlandevice_t *wlandev, u8 failed)

void prism2_connect_result(struct wlandevice *wlandev, u8 failed)

{

	u16 status = failed ?

		     WLAN_STATUS_UNSPECIFIED_FAILURE : WLAN_STATUS_SUCCESS;
@@ -658,13 +658,13 @@ void prism2_connect_result(wlandevice_t *wlandev, u8 failed) 
				NULL, 0, NULL, 0, status, GFP_KERNEL);

}



void prism2_disconnected(wlandevice_t *wlandev)

void prism2_disconnected(struct wlandevice *wlandev)

{

	cfg80211_disconnected(wlandev->netdev, 0, NULL,

		0, false, GFP_KERNEL);

}



void prism2_roamed(wlandevice_t *wlandev)

void prism2_roamed(struct wlandevice *wlandev)

{

	cfg80211_roamed(wlandev->netdev, NULL, wlandev->bssid,

		NULL, 0, NULL, 0, GFP_KERNEL);
@@ -689,7 +689,7 @@ static const struct cfg80211_ops prism2_usb_cfg_ops = { 
};



/* Functions to create/free wiphy interface */

static struct wiphy *wlan_create_wiphy(struct device *dev, wlandevice_t *wlandev)

static struct wiphy *wlan_create_wiphy(struct device *dev, struct wlandevice *wlandev)

{

	struct wiphy *wiphy;

	struct prism2_wiphy_private *priv;

drivers/staging/wlan-ng/hfa384x.h

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ typedef struct hfa384x { 
	int join_retries;	/* number of join retries till we fail */

	hfa384x_JoinRequest_data_t joinreq;	/* join request saved data */



	wlandevice_t *wlandev;

	struct wlandevice *wlandev;

	/* Timer to allow for the deferred processing of linkstatus messages */

	struct work_struct link_bh;
@@ -1410,7 +1410,7 @@ int 
hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,

		     union p80211_hdr *p80211_hdr,

		     struct p80211_metawep *p80211_wep);

void hfa384x_tx_timeout(wlandevice_t *wlandev);

void hfa384x_tx_timeout(struct wlandevice *wlandev);



int hfa384x_cmd_initialize(hfa384x_t *hw);

int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport);

drivers/staging/wlan-ng/hfa384x_usb.c

+11 −11
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void dbprint_urb(struct urb *urb); 
#endif



static void

hfa384x_int_rxmonitor(wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *rxfrm);

hfa384x_int_rxmonitor(struct wlandevice *wlandev, hfa384x_usb_rxfrm_t *rxfrm);



static void hfa384x_usb_defer(struct work_struct *data);
@@ -169,11 +169,11 @@ static void hfa384x_ctlxout_callback(struct urb *urb); 
static void hfa384x_usbin_callback(struct urb *urb);



static void

hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);

hfa384x_usbin_txcompl(struct wlandevice *wlandev, hfa384x_usbin_t *usbin);



static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb);

static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb);



static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin);

static void hfa384x_usbin_info(struct wlandevice *wlandev, hfa384x_usbin_t *usbin);



static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,

			       int urb_status);
@@ -2656,7 +2656,7 @@ int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, 
	return result;

}



void hfa384x_tx_timeout(wlandevice_t *wlandev)

void hfa384x_tx_timeout(struct wlandevice *wlandev)

{

	hfa384x_t *hw = wlandev->priv;

	unsigned long flags;
@@ -2988,7 +2988,7 @@ static void hfa384x_usbctlxq_run(hfa384x_t *hw) 
----------------------------------------------------------------*/

static void hfa384x_usbin_callback(struct urb *urb)

{

	wlandevice_t *wlandev = urb->context;

	struct wlandevice *wlandev = urb->context;

	hfa384x_t *hw;

	hfa384x_usbin_t *usbin = (hfa384x_usbin_t *)urb->transfer_buffer;

	struct sk_buff *skb = NULL;
@@ -3285,7 +3285,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, 
* Call context:

*	interrupt

----------------------------------------------------------------*/

static void hfa384x_usbin_txcompl(wlandevice_t *wlandev,

static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,

				  hfa384x_usbin_t *usbin)

{

	u16 status;
@@ -3316,7 +3316,7 @@ static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, 
* Call context:

*	interrupt

----------------------------------------------------------------*/

static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)

static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)

{

	hfa384x_usbin_t *usbin = (hfa384x_usbin_t *)skb->data;

	hfa384x_t *hw = wlandev->priv;
@@ -3416,7 +3416,7 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb) 
* Call context:

*	interrupt

----------------------------------------------------------------*/

static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,

static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,

				  hfa384x_usb_rxfrm_t *rxfrm)

{

	hfa384x_rx_frame_t *rxdesc = &(rxfrm->desc);
@@ -3517,7 +3517,7 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev, 
* Call context:

*	interrupt

----------------------------------------------------------------*/

static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)

static void hfa384x_usbin_info(struct wlandevice *wlandev, hfa384x_usbin_t *usbin)

{

	usbin->infofrm.info.framelen =

	    le16_to_cpu(usbin->infofrm.info.framelen);
@@ -3542,7 +3542,7 @@ static void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin) 
----------------------------------------------------------------*/

static void hfa384x_usbout_callback(struct urb *urb)

{

	wlandevice_t *wlandev = urb->context;

	struct wlandevice *wlandev = urb->context;



#ifdef DEBUG_USB

	dbprint_urb(urb);

drivers/staging/wlan-ng/p80211conv.c

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static const u8 oui_8021h[] = { 0x00, 0x00, 0xf8 }; 
*	May be called in interrupt or non-interrupt context

*----------------------------------------------------------------

*/

int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,

int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb, union p80211_hdr *p80211_hdr,

			struct p80211_metawep *p80211_wep)

{
@@ -232,7 +232,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, 
}



/* jkriegl: from orinoco, modified */

static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,

static void orinoco_spy_gather(struct wlandevice *wlandev, char *mac,

			       struct p80211_rxmeta *rxmeta)

{

	int i;
@@ -274,7 +274,7 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac, 
*	May be called in interrupt or non-interrupt context

*----------------------------------------------------------------

*/

int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,

int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb)

{

	netdevice_t *netdev = wlandev->netdev;

drivers/staging/wlan-ng/p80211netdev.c

+18 −18
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, 
				  int cmd);

static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr);

static void p80211knetdev_tx_timeout(netdevice_t *netdev);

static int p80211_rx_typedrop(wlandevice_t *wlandev, u16 fc);

static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc);



int wlan_watchdog = 5000;

module_param(wlan_watchdog, int, 0644);
@@ -149,7 +149,7 @@ static int p80211knetdev_init(netdevice_t *netdev) 
static int p80211knetdev_open(netdevice_t *netdev)

{

	int result = 0;		/* success */

	wlandevice_t *wlandev = netdev->ml_priv;

	struct wlandevice *wlandev = netdev->ml_priv;



	/* Check to make sure the MSD is running */

	if (wlandev->msdstate != WLAN_MSD_RUNNING)
@@ -184,7 +184,7 @@ static int p80211knetdev_open(netdevice_t *netdev) 
static int p80211knetdev_stop(netdevice_t *netdev)

{

	int result = 0;

	wlandevice_t *wlandev = netdev->ml_priv;

	struct wlandevice *wlandev = netdev->ml_priv;



	if (wlandev->close)

		result = wlandev->close(wlandev);
@@ -208,7 +208,7 @@ static int p80211knetdev_stop(netdevice_t *netdev) 
* Side effects:

*

----------------------------------------------------------------*/

void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb)

void p80211netdev_rx(struct wlandevice *wlandev, struct sk_buff *skb)

{

	/* Enqueue for post-irq processing */

	skb_queue_tail(&wlandev->nsd_rxq, skb);
@@ -227,7 +227,7 @@ void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb) 
 *	    CONV_TO_ETHER_FAILED if conversion failed

 *	    CONV_TO_ETHER_SKIPPED if frame is ignored

 */

static int p80211_convert_to_ether(wlandevice_t *wlandev, struct sk_buff *skb)

static int p80211_convert_to_ether(struct wlandevice *wlandev, struct sk_buff *skb)

{

	struct p80211_hdr_a3 *hdr;
@@ -265,7 +265,7 @@ static int p80211_convert_to_ether(wlandevice_t *wlandev, struct sk_buff *skb) 
 */

static void p80211netdev_rx_bh(unsigned long arg)

{

	wlandevice_t *wlandev = (wlandevice_t *) arg;

	struct wlandevice *wlandev = (struct wlandevice *) arg;

	struct sk_buff *skb = NULL;

	netdevice_t *dev = wlandev->netdev;
@@ -322,7 +322,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, 
{

	int result = 0;

	int txresult = -1;

	wlandevice_t *wlandev = netdev->ml_priv;

	struct wlandevice *wlandev = netdev->ml_priv;

	union p80211_hdr p80211_hdr;

	struct p80211_metawep p80211_wep;
@@ -448,7 +448,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, 
----------------------------------------------------------------*/

static void p80211knetdev_set_multicast_list(netdevice_t *dev)

{

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;



	/* TODO:  real multicast support as well */
@@ -459,7 +459,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev) 


#ifdef SIOCETHTOOL



static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)

static int p80211netdev_ethtool(struct wlandevice *wlandev, void __user *useraddr)

{

	u32 ethcmd;

	struct ethtool_drvinfo info;
@@ -535,7 +535,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) 
{

	int result = 0;

	struct p80211ioctl_req *req = (struct p80211ioctl_req *) ifr;

	wlandevice_t *wlandev = dev->ml_priv;

	struct wlandevice *wlandev = dev->ml_priv;

	u8 *msgbuf;



	netdev_dbg(dev, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
@@ -633,7 +633,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr) 
	dot11req.msgcode = DIDmsg_dot11req_mibset;

	dot11req.msglen = sizeof(struct p80211msg_dot11req_mibset);

	memcpy(dot11req.devname,

	       ((wlandevice_t *) dev->ml_priv)->name, WLAN_DEVNAMELEN_MAX - 1);

	       ((struct wlandevice *) dev->ml_priv)->name, WLAN_DEVNAMELEN_MAX - 1);



	/* Set up the mibattribute argument */

	mibattr->did = DIDmsg_dot11req_mibset_mibattribute;
@@ -717,7 +717,7 @@ static const struct net_device_ops p80211_netdev_ops = { 
*	compiled drivers, this function will be called in the

*	context of the kernel startup code.

----------------------------------------------------------------*/

int wlan_setup(wlandevice_t *wlandev, struct device *physdev)

int wlan_setup(struct wlandevice *wlandev, struct device *physdev)

{

	int result = 0;

	netdevice_t *netdev;
@@ -783,7 +783,7 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev) 
*	compiled drivers, this function will be called in the

*	context of the kernel startup code.

----------------------------------------------------------------*/

void wlan_unsetup(wlandevice_t *wlandev)

void wlan_unsetup(struct wlandevice *wlandev)

{

	struct wireless_dev *wdev;
@@ -817,7 +817,7 @@ void wlan_unsetup(wlandevice_t *wlandev) 
* Call Context:

*	Can be either interrupt or not.

----------------------------------------------------------------*/

int register_wlandev(wlandevice_t *wlandev)

int register_wlandev(struct wlandevice *wlandev)

{

	return register_netdev(wlandev->netdev);

}
@@ -839,7 +839,7 @@ int register_wlandev(wlandevice_t *wlandev) 
* Call Context:

*	Can be either interrupt or not.

----------------------------------------------------------------*/

int unregister_wlandev(wlandevice_t *wlandev)

int unregister_wlandev(struct wlandevice *wlandev)

{

	struct sk_buff *skb;
@@ -882,7 +882,7 @@ int unregister_wlandev(wlandevice_t *wlandev) 
* Call context:

*	Usually interrupt.

----------------------------------------------------------------*/

void p80211netdev_hwremoved(wlandevice_t *wlandev)

void p80211netdev_hwremoved(struct wlandevice *wlandev)

{

	wlandev->hwremoved = 1;

	if (wlandev->state == WLAN_DEVICE_OPEN)
@@ -912,7 +912,7 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev) 
* Call context:

*	interrupt

----------------------------------------------------------------*/

static int p80211_rx_typedrop(wlandevice_t *wlandev, u16 fc)

static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)

{

	u16 ftype;

	u16 fstype;
@@ -1073,7 +1073,7 @@ static int p80211_rx_typedrop(wlandevice_t *wlandev, u16 fc) 


static void p80211knetdev_tx_timeout(netdevice_t *netdev)

{

	wlandevice_t *wlandev = netdev->ml_priv;

	struct wlandevice *wlandev = netdev->ml_priv;



	if (wlandev->tx_timeout) {

		wlandev->tx_timeout(wlandev);