staging: wlan-ng: avoid new typedef: netdevice_t (19066982) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/staging/wlan-ng/p80211conv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -277,7 +277,7 @@ static void orinoco_spy_gather(struct wlandevice wlandev, char mac,
	int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,		int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
	struct sk_buff *skb)		struct sk_buff *skb)
	{		{
	netdevice_t *netdev = wlandev->netdev;		struct net_device *netdev = wlandev->netdev;
	u16 fc;		u16 fc;
	unsigned int payload_length;		unsigned int payload_length;
	unsigned int payload_offset;		unsigned int payload_offset;

drivers/staging/wlan-ng/p80211netdev.c

+19 −19

Original line number	Original line	Diff line number	Diff line
	@@ -91,16 +91,16 @@
	#include "cfg80211.c"		#include "cfg80211.c"

	/* netdevice method functions */		/* netdevice method functions */
	static int p80211knetdev_init(netdevice_t *netdev);		static int p80211knetdev_init(struct net_device *netdev);
	static int p80211knetdev_open(netdevice_t *netdev);		static int p80211knetdev_open(struct net_device *netdev);
	static int p80211knetdev_stop(netdevice_t *netdev);		static int p80211knetdev_stop(struct net_device *netdev);
	static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,		static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
	netdevice_t *netdev);		struct net_device *netdev);
	static void p80211knetdev_set_multicast_list(netdevice_t *dev);		static void p80211knetdev_set_multicast_list(struct net_device *dev);
	static int p80211knetdev_do_ioctl(netdevice_t dev, struct ifreq ifr,		static int p80211knetdev_do_ioctl(struct net_device dev, struct ifreq ifr,
	int cmd);		int cmd);
	static int p80211knetdev_set_mac_address(netdevice_t dev, void addr);		static int p80211knetdev_set_mac_address(struct net_device dev, void addr);
	static void p80211knetdev_tx_timeout(netdevice_t *netdev);		static void p80211knetdev_tx_timeout(struct net_device *netdev);
	static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc);		static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc);

	int wlan_watchdog = 5000;		int wlan_watchdog = 5000;
	@@ -123,7 +123,7 @@ MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions");
	* Returns:		* Returns:
	* nothing		* nothing
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_init(netdevice_t *netdev)		static int p80211knetdev_init(struct net_device *netdev)
	{		{
	/* Called in response to register_netdev */		/* Called in response to register_netdev */
	/* This is usually the probe function, but the probe has */		/* This is usually the probe function, but the probe has */
	@@ -146,7 +146,7 @@ static int p80211knetdev_init(netdevice_t *netdev)
	* Returns:		* Returns:
	* zero on success, non-zero otherwise		* zero on success, non-zero otherwise
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_open(netdevice_t *netdev)		static int p80211knetdev_open(struct net_device *netdev)
	{		{
	int result = 0; /* success */		int result = 0; /* success */
	struct wlandevice *wlandev = netdev->ml_priv;		struct wlandevice *wlandev = netdev->ml_priv;
	@@ -181,7 +181,7 @@ static int p80211knetdev_open(netdevice_t *netdev)
	* Returns:		* Returns:
	* zero on success, non-zero otherwise		* zero on success, non-zero otherwise
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_stop(netdevice_t *netdev)		static int p80211knetdev_stop(struct net_device *netdev)
	{		{
	int result = 0;		int result = 0;
	struct wlandevice *wlandev = netdev->ml_priv;		struct wlandevice *wlandev = netdev->ml_priv;
	@@ -267,7 +267,7 @@ static void p80211netdev_rx_bh(unsigned long arg)
	{		{
	struct wlandevice wlandev = (struct wlandevice )arg;		struct wlandevice wlandev = (struct wlandevice )arg;
	struct sk_buff *skb = NULL;		struct sk_buff *skb = NULL;
	netdevice_t *dev = wlandev->netdev;		struct net_device *dev = wlandev->netdev;

	/* Let's empty our our queue */		/* Let's empty our our queue */
	while ((skb = skb_dequeue(&wlandev->nsd_rxq))) {		while ((skb = skb_dequeue(&wlandev->nsd_rxq))) {
	@@ -318,7 +318,7 @@ static void p80211netdev_rx_bh(unsigned long arg)
	* zero on success, non-zero on failure.		* zero on success, non-zero on failure.
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,		static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
	netdevice_t *netdev)		struct net_device *netdev)
	{		{
	int result = 0;		int result = 0;
	int txresult = -1;		int txresult = -1;
	@@ -446,7 +446,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
	* Returns:		* Returns:
	* nothing		* nothing
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static void p80211knetdev_set_multicast_list(netdevice_t *dev)		static void p80211knetdev_set_multicast_list(struct net_device *dev)
	{		{
	struct wlandevice *wlandev = dev->ml_priv;		struct wlandevice *wlandev = dev->ml_priv;

	@@ -531,7 +531,7 @@ static int p80211netdev_ethtool(struct wlandevice wlandev, void __user useradd
	* Process thread (ioctl caller). TODO: SMP support may require		* Process thread (ioctl caller). TODO: SMP support may require
	* locks.		* locks.
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_do_ioctl(netdevice_t dev, struct ifreq ifr, int cmd)		static int p80211knetdev_do_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
	{		{
	int result = 0;		int result = 0;
	struct p80211ioctl_req req = (struct p80211ioctl_req )ifr;		struct p80211ioctl_req req = (struct p80211ioctl_req )ifr;
	@@ -610,7 +610,7 @@ static int p80211knetdev_do_ioctl(netdevice_t dev, struct ifreq ifr, int cmd)
	*		*
	* by: Collin R. Mulliner <collin@mulliner.org>		* by: Collin R. Mulliner <collin@mulliner.org>
	----------------------------------------------------------------*/		----------------------------------------------------------------*/
	static int p80211knetdev_set_mac_address(netdevice_t dev, void addr)		static int p80211knetdev_set_mac_address(struct net_device dev, void addr)
	{		{
	struct sockaddr *new_addr = addr;		struct sockaddr *new_addr = addr;
	struct p80211msg_dot11req_mibset dot11req;		struct p80211msg_dot11req_mibset dot11req;
	@@ -669,7 +669,7 @@ static int p80211knetdev_set_mac_address(netdevice_t dev, void addr)
	return result;		return result;
	}		}

	static int wlan_change_mtu(netdevice_t *dev, int new_mtu)		static int wlan_change_mtu(struct net_device *dev, int new_mtu)
	{		{
	/* 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)		/* 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)
	and another 8 for wep. */		and another 8 for wep. */
	@@ -720,7 +720,7 @@ static const struct net_device_ops p80211_netdev_ops = {
	int wlan_setup(struct wlandevice wlandev, struct device physdev)		int wlan_setup(struct wlandevice wlandev, struct device physdev)
	{		{
	int result = 0;		int result = 0;
	netdevice_t *netdev;		struct net_device *netdev;
	struct wiphy *wiphy;		struct wiphy *wiphy;
	struct wireless_dev *wdev;		struct wireless_dev *wdev;

	@@ -1071,7 +1071,7 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)
	return drop;		return drop;
	}		}

	static void p80211knetdev_tx_timeout(netdevice_t *netdev)		static void p80211knetdev_tx_timeout(struct net_device *netdev)
	{		{
	struct wlandevice *wlandev = netdev->ml_priv;		struct wlandevice *wlandev = netdev->ml_priv;

drivers/staging/wlan-ng/p80211netdev.h

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -57,9 +57,6 @@
	#include <linux/wireless.h>		#include <linux/wireless.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>

	#undef netdevice_t
	typedef struct net_device netdevice_t;

	#define WLAN_RELEASE "0.3.0-staging"		#define WLAN_RELEASE "0.3.0-staging"

	#define WLAN_DEVICE_CLOSED 0		#define WLAN_DEVICE_CLOSED 0
	@@ -138,7 +135,7 @@ typedef struct p80211_frmrx_t {
	} p80211_frmrx_t;		} p80211_frmrx_t;

	/* called by /proc/net/wireless */		/* called by /proc/net/wireless */
	struct iw_statistics p80211wext_get_wireless_stats(netdevice_t dev);		struct iw_statistics p80211wext_get_wireless_stats(struct net_device dev);
	/* wireless extensions' ioctls */		/* wireless extensions' ioctls */
	extern struct iw_handler_def p80211wext_handler_def;		extern struct iw_handler_def p80211wext_handler_def;

	@@ -186,7 +183,7 @@ struct wlandevice {
	struct p80211_metawep *p80211_wep);		struct p80211_metawep *p80211_wep);
	int (mlmerequest)(struct wlandevice wlandev, struct p80211msg *msg);		int (mlmerequest)(struct wlandevice wlandev, struct p80211msg *msg);
	int (set_multicast_list)(struct wlandevice wlandev,		int (set_multicast_list)(struct wlandevice wlandev,
	netdevice_t *dev);		struct net_device *dev);
	void (tx_timeout)(struct wlandevice wlandev);		void (tx_timeout)(struct wlandevice wlandev);

	/* 802.11 State */		/* 802.11 State */
	@@ -206,7 +203,7 @@ struct wlandevice {
	/* netlink socket */		/* netlink socket */
	/* queue for indications waiting for cmd completion */		/* queue for indications waiting for cmd completion */
	/* Linux netdevice and support */		/* Linux netdevice and support */
	netdevice_t netdev; / ptr to linux netdevice */		struct net_device netdev; / ptr to linux netdevice */

	/* Rx bottom half */		/* Rx bottom half */
	struct tasklet_struct rx_bh;		struct tasklet_struct rx_bh;

drivers/staging/wlan-ng/prism2sta.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,8 @@ static int prism2sta_txframe(struct wlandevice wlandev, struct sk_buff skb,
	static int prism2sta_mlmerequest(struct wlandevice wlandev, struct p80211msg msg);		static int prism2sta_mlmerequest(struct wlandevice wlandev, struct p80211msg msg);
	static int prism2sta_getcardinfo(struct wlandevice *wlandev);		static int prism2sta_getcardinfo(struct wlandevice *wlandev);
	static int prism2sta_globalsetup(struct wlandevice *wlandev);		static int prism2sta_globalsetup(struct wlandevice *wlandev);
	static int prism2sta_setmulticast(struct wlandevice wlandev, netdevice_t dev);		static int prism2sta_setmulticast(struct wlandevice *wlandev,
			struct net_device *dev);

	static void prism2sta_inf_handover(struct wlandevice *wlandev,		static void prism2sta_inf_handover(struct wlandevice *wlandev,
	hfa384x_InfFrame_t *inf);		hfa384x_InfFrame_t *inf);
	@@ -918,7 +919,8 @@ static int prism2sta_globalsetup(struct wlandevice *wlandev)
	WLAN_DATA_MAXLEN);		WLAN_DATA_MAXLEN);
	}		}

	static int prism2sta_setmulticast(struct wlandevice wlandev, netdevice_t dev)		static int prism2sta_setmulticast(struct wlandevice *wlandev,
			struct net_device *dev)
	{		{
	int result = 0;		int result = 0;
	hfa384x_t *hw = wlandev->priv;		hfa384x_t *hw = wlandev->priv;