libipw: switch from ieee80211_* to libipw_* naming policy (b0a4e7d8) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ipw2x00/ipw2100.c

+99 −99

Original line number	Original line	Diff line number	Diff line
	@@ -1673,7 +1673,7 @@ static int ipw2100_start_scan(struct ipw2100_priv *priv)
	return err;		return err;
	}		}

	static const struct ieee80211_geo ipw_geos[] = {		static const struct libipw_geo ipw_geos[] = {
	{ /* Restricted */		{ /* Restricted */
	"---",		"---",
	.bg_channels = 14,		.bg_channels = 14,
	@@ -1694,7 +1694,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)

	/* Age scan list entries found before suspend */		/* Age scan list entries found before suspend */
	if (priv->suspend_time) {		if (priv->suspend_time) {
	ieee80211_networks_age(priv->ieee, priv->suspend_time);		libipw_networks_age(priv->ieee, priv->suspend_time);
	priv->suspend_time = 0;		priv->suspend_time = 0;
	}		}

	@@ -1752,11 +1752,11 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
	}		}

	/* Initialize the geo */		/* Initialize the geo */
	if (ieee80211_set_geo(priv->ieee, &ipw_geos[0])) {		if (libipw_set_geo(priv->ieee, &ipw_geos[0])) {
	printk(KERN_WARNING DRV_NAME "Could not set geo\n");		printk(KERN_WARNING DRV_NAME "Could not set geo\n");
	return 0;		return 0;
	}		}
	priv->ieee->freq_band = IEEE80211_24GHZ_BAND;		priv->ieee->freq_band = LIBIPW_24GHZ_BAND;

	lock = LOCK_NONE;		lock = LOCK_NONE;
	if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {		if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
	@@ -1817,7 +1817,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
	/* Called by register_netdev() */		/* Called by register_netdev() */
	static int ipw2100_net_init(struct net_device *dev)		static int ipw2100_net_init(struct net_device *dev)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ipw2100_up(priv, 1);		return ipw2100_up(priv, 1);
	}		}

	@@ -2340,8 +2340,8 @@ static u32 ipw2100_match_buf(struct ipw2100_priv priv, u8 in_buf,
	*		*
	* When packet is provided by the firmware, it contains the following:		* When packet is provided by the firmware, it contains the following:
	*		*
	* . ieee80211_hdr		* . libipw_hdr
	* . ieee80211_snap_hdr		* . libipw_snap_hdr
	*		*
	* The size of the constructed ethernet		* The size of the constructed ethernet
	*		*
	@@ -2396,7 +2396,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
	}		}

	static void isr_rx(struct ipw2100_priv *priv, int i,		static void isr_rx(struct ipw2100_priv *priv, int i,
	struct ieee80211_rx_stats *stats)		struct libipw_rx_stats *stats)
	{		{
	struct net_device *dev = priv->net_dev;		struct net_device *dev = priv->net_dev;
	struct ipw2100_status *status = &priv->status_queue.drv[i];		struct ipw2100_status *status = &priv->status_queue.drv[i];
	@@ -2435,13 +2435,13 @@ static void isr_rx(struct ipw2100_priv *priv, int i,

	#ifdef IPW2100_RX_DEBUG		#ifdef IPW2100_RX_DEBUG
	/* Make a copy of the frame so we can dump it to the logs if		/* Make a copy of the frame so we can dump it to the logs if
	* ieee80211_rx fails */		* libipw_rx fails */
	skb_copy_from_linear_data(packet->skb, packet_data,		skb_copy_from_linear_data(packet->skb, packet_data,
	min_t(u32, status->frame_size,		min_t(u32, status->frame_size,
	IPW_RX_NIC_BUFFER_LENGTH));		IPW_RX_NIC_BUFFER_LENGTH));
	#endif		#endif

	if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {		if (!libipw_rx(priv->ieee, packet->skb, stats)) {
	#ifdef IPW2100_RX_DEBUG		#ifdef IPW2100_RX_DEBUG
	IPW_DEBUG_DROP("%s: Non consumed packet:\n",		IPW_DEBUG_DROP("%s: Non consumed packet:\n",
	dev->name);		dev->name);
	@@ -2449,7 +2449,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i,
	#endif		#endif
	dev->stats.rx_errors++;		dev->stats.rx_errors++;

	/* ieee80211_rx failed, so it didn't free the SKB */		/* libipw_rx failed, so it didn't free the SKB */
	dev_kfree_skb_any(packet->skb);		dev_kfree_skb_any(packet->skb);
	packet->skb = NULL;		packet->skb = NULL;
	}		}
	@@ -2470,7 +2470,7 @@ static void isr_rx(struct ipw2100_priv *priv, int i,
	#ifdef CONFIG_IPW2100_MONITOR		#ifdef CONFIG_IPW2100_MONITOR

	static void isr_rx_monitor(struct ipw2100_priv *priv, int i,		static void isr_rx_monitor(struct ipw2100_priv *priv, int i,
	struct ieee80211_rx_stats *stats)		struct libipw_rx_stats *stats)
	{		{
	struct net_device *dev = priv->net_dev;		struct net_device *dev = priv->net_dev;
	struct ipw2100_status *status = &priv->status_queue.drv[i];		struct ipw2100_status *status = &priv->status_queue.drv[i];
	@@ -2528,10 +2528,10 @@ static void isr_rx_monitor(struct ipw2100_priv *priv, int i,

	skb_put(packet->skb, status->frame_size + sizeof(struct ipw_rt_hdr));		skb_put(packet->skb, status->frame_size + sizeof(struct ipw_rt_hdr));

	if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {		if (!libipw_rx(priv->ieee, packet->skb, stats)) {
	dev->stats.rx_errors++;		dev->stats.rx_errors++;

	/* ieee80211_rx failed, so it didn't free the SKB */		/* libipw_rx failed, so it didn't free the SKB */
	dev_kfree_skb_any(packet->skb);		dev_kfree_skb_any(packet->skb);
	packet->skb = NULL;		packet->skb = NULL;
	}		}
	@@ -2615,7 +2615,7 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
	u16 frame_type;		u16 frame_type;
	u32 r, w, i, s;		u32 r, w, i, s;
	struct ipw2100_rx *u;		struct ipw2100_rx *u;
	struct ieee80211_rx_stats stats = {		struct libipw_rx_stats stats = {
	.mac_time = jiffies,		.mac_time = jiffies,
	};		};

	@@ -2661,8 +2661,8 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)

	stats.mask = 0;		stats.mask = 0;
	if (stats.rssi != 0)		if (stats.rssi != 0)
	stats.mask \|= IEEE80211_STATMASK_RSSI;		stats.mask \|= LIBIPW_STATMASK_RSSI;
	stats.freq = IEEE80211_24GHZ_BAND;		stats.freq = LIBIPW_24GHZ_BAND;

	IPW_DEBUG_RX("%s: '%s' frame type received (%d).\n",		IPW_DEBUG_RX("%s: '%s' frame type received (%d).\n",
	priv->net_dev->name, frame_types[frame_type],		priv->net_dev->name, frame_types[frame_type],
	@@ -2686,11 +2686,11 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
	break;		break;
	}		}
	#endif		#endif
	if (stats.len < sizeof(struct ieee80211_hdr_3addr))		if (stats.len < sizeof(struct libipw_hdr_3addr))
	break;		break;
	switch (WLAN_FC_GET_TYPE(le16_to_cpu(u->rx_data.header.frame_ctl))) {		switch (WLAN_FC_GET_TYPE(le16_to_cpu(u->rx_data.header.frame_ctl))) {
	case IEEE80211_FTYPE_MGMT:		case IEEE80211_FTYPE_MGMT:
	ieee80211_rx_mgt(priv->ieee,		libipw_rx_mgt(priv->ieee,
	&u->rx_data.header, &stats);		&u->rx_data.header, &stats);
	break;		break;

	@@ -2884,7 +2884,7 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv)
	tbd->buf_length, PCI_DMA_TODEVICE);		tbd->buf_length, PCI_DMA_TODEVICE);
	}		}

	ieee80211_txb_free(packet->info.d_struct.txb);		libipw_txb_free(packet->info.d_struct.txb);
	packet->info.d_struct.txb = NULL;		packet->info.d_struct.txb = NULL;

	list_add_tail(element, &priv->tx_free_list);		list_add_tail(element, &priv->tx_free_list);
	@@ -3028,7 +3028,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
	int next = txq->next;		int next = txq->next;
	int i = 0;		int i = 0;
	struct ipw2100_data_header *ipw_hdr;		struct ipw2100_data_header *ipw_hdr;
	struct ieee80211_hdr_3addr *hdr;		struct libipw_hdr_3addr *hdr;

	while (!list_empty(&priv->tx_pend_list)) {		while (!list_empty(&priv->tx_pend_list)) {
	/* if there isn't enough space in TBD queue, then		/* if there isn't enough space in TBD queue, then
	@@ -3062,7 +3062,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
	packet->index = txq->next;		packet->index = txq->next;

	ipw_hdr = packet->info.d_struct.data;		ipw_hdr = packet->info.d_struct.data;
	hdr = (struct ieee80211_hdr_3addr *)packet->info.d_struct.txb->		hdr = (struct libipw_hdr_3addr *)packet->info.d_struct.txb->
	fragments[0]->data;		fragments[0]->data;

	if (priv->ieee->iw_mode == IW_MODE_INFRA) {		if (priv->ieee->iw_mode == IW_MODE_INFRA) {
	@@ -3086,7 +3086,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
	if (packet->info.d_struct.txb->nr_frags > 1)		if (packet->info.d_struct.txb->nr_frags > 1)
	ipw_hdr->fragment_size =		ipw_hdr->fragment_size =
	packet->info.d_struct.txb->frag_size -		packet->info.d_struct.txb->frag_size -
	IEEE80211_3ADDR_LEN;		LIBIPW_3ADDR_LEN;
	else		else
	ipw_hdr->fragment_size = 0;		ipw_hdr->fragment_size = 0;

	@@ -3119,13 +3119,13 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
	IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;		IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;

	tbd->buf_length = packet->info.d_struct.txb->		tbd->buf_length = packet->info.d_struct.txb->
	fragments[i]->len - IEEE80211_3ADDR_LEN;		fragments[i]->len - LIBIPW_3ADDR_LEN;

	tbd->host_addr = pci_map_single(priv->pci_dev,		tbd->host_addr = pci_map_single(priv->pci_dev,
	packet->info.d_struct.		packet->info.d_struct.
	txb->fragments[i]->		txb->fragments[i]->
	data +		data +
	IEEE80211_3ADDR_LEN,		LIBIPW_3ADDR_LEN,
	tbd->buf_length,		tbd->buf_length,
	PCI_DMA_TODEVICE);		PCI_DMA_TODEVICE);

	@@ -3330,10 +3330,10 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data)
	return IRQ_NONE;		return IRQ_NONE;
	}		}

	static int ipw2100_tx(struct ieee80211_txb txb, struct net_device dev,		static int ipw2100_tx(struct libipw_txb txb, struct net_device dev,
	int pri)		int pri)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct list_head *element;		struct list_head *element;
	struct ipw2100_tx_packet *packet;		struct ipw2100_tx_packet *packet;
	unsigned long flags;		unsigned long flags;
	@@ -4488,7 +4488,7 @@ static void ipw2100_tx_initialize(struct ipw2100_priv *priv)
	/* We simply drop any SKBs that have been queued for		/* We simply drop any SKBs that have been queued for
	* transmit */		* transmit */
	if (priv->tx_buffers[i].info.d_struct.txb) {		if (priv->tx_buffers[i].info.d_struct.txb) {
	ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.		libipw_txb_free(priv->tx_buffers[i].info.d_struct.
	txb);		txb);
	priv->tx_buffers[i].info.d_struct.txb = NULL;		priv->tx_buffers[i].info.d_struct.txb = NULL;
	}		}
	@@ -4527,7 +4527,7 @@ static void ipw2100_tx_free(struct ipw2100_priv *priv)

	for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {		for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
	if (priv->tx_buffers[i].info.d_struct.txb) {		if (priv->tx_buffers[i].info.d_struct.txb) {
	ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.		libipw_txb_free(priv->tx_buffers[i].info.d_struct.
	txb);		txb);
	priv->tx_buffers[i].info.d_struct.txb = NULL;		priv->tx_buffers[i].info.d_struct.txb = NULL;
	}		}
	@@ -5558,9 +5558,9 @@ static void ipw2100_security_work(struct work_struct *work)
	}		}

	static void shim__set_security(struct net_device *dev,		static void shim__set_security(struct net_device *dev,
	struct ieee80211_security *sec)		struct libipw_security *sec)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int i, force_update = 0;		int i, force_update = 0;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -5753,7 +5753,7 @@ static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
	* method as well) to talk to the firmware */		* method as well) to talk to the firmware */
	static int ipw2100_set_address(struct net_device dev, void p)		static int ipw2100_set_address(struct net_device dev, void p)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct sockaddr *addr = p;		struct sockaddr *addr = p;
	int err = 0;		int err = 0;

	@@ -5781,7 +5781,7 @@ static int ipw2100_set_address(struct net_device dev, void p)

	static int ipw2100_open(struct net_device *dev)		static int ipw2100_open(struct net_device *dev)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	unsigned long flags;		unsigned long flags;
	IPW_DEBUG_INFO("dev->open\n");		IPW_DEBUG_INFO("dev->open\n");

	@@ -5797,7 +5797,7 @@ static int ipw2100_open(struct net_device *dev)

	static int ipw2100_close(struct net_device *dev)		static int ipw2100_close(struct net_device *dev)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	unsigned long flags;		unsigned long flags;
	struct list_head *element;		struct list_head *element;
	struct ipw2100_tx_packet *packet;		struct ipw2100_tx_packet *packet;
	@@ -5818,7 +5818,7 @@ static int ipw2100_close(struct net_device *dev)
	list_del(element);		list_del(element);
	DEC_STAT(&priv->tx_pend_stat);		DEC_STAT(&priv->tx_pend_stat);

	ieee80211_txb_free(packet->info.d_struct.txb);		libipw_txb_free(packet->info.d_struct.txb);
	packet->info.d_struct.txb = NULL;		packet->info.d_struct.txb = NULL;

	list_add_tail(element, &priv->tx_free_list);		list_add_tail(element, &priv->tx_free_list);
	@@ -5836,7 +5836,7 @@ static int ipw2100_close(struct net_device *dev)
	*/		*/
	static void ipw2100_tx_timeout(struct net_device *dev)		static void ipw2100_tx_timeout(struct net_device *dev)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	dev->stats.tx_errors++;		dev->stats.tx_errors++;

	@@ -5861,8 +5861,8 @@ static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value)
	static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value)		static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value)
	{		{

	struct ieee80211_device *ieee = priv->ieee;		struct libipw_device *ieee = priv->ieee;
	struct ieee80211_security sec = {		struct libipw_security sec = {
	.flags = SEC_AUTH_MODE,		.flags = SEC_AUTH_MODE,
	};		};
	int ret = 0;		int ret = 0;
	@@ -5907,7 +5907,7 @@ static void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
	static void ipw_ethtool_get_drvinfo(struct net_device *dev,		static void ipw_ethtool_get_drvinfo(struct net_device *dev,
	struct ethtool_drvinfo *info)		struct ethtool_drvinfo *info)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	char fw_ver[64], ucode_ver[64];		char fw_ver[64], ucode_ver[64];

	strcpy(info->driver, DRV_NAME);		strcpy(info->driver, DRV_NAME);
	@@ -5924,7 +5924,7 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,

	static u32 ipw2100_ethtool_get_link(struct net_device *dev)		static u32 ipw2100_ethtool_get_link(struct net_device *dev)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;		return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
	}		}

	@@ -6011,8 +6011,8 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
	static const struct net_device_ops ipw2100_netdev_ops = {		static const struct net_device_ops ipw2100_netdev_ops = {
	.ndo_open = ipw2100_open,		.ndo_open = ipw2100_open,
	.ndo_stop = ipw2100_close,		.ndo_stop = ipw2100_close,
	.ndo_start_xmit = ieee80211_xmit,		.ndo_start_xmit = libipw_xmit,
	.ndo_change_mtu = ieee80211_change_mtu,		.ndo_change_mtu = libipw_change_mtu,
	.ndo_init = ipw2100_net_init,		.ndo_init = ipw2100_net_init,
	.ndo_tx_timeout = ipw2100_tx_timeout,		.ndo_tx_timeout = ipw2100_tx_timeout,
	.ndo_set_mac_address = ipw2100_set_address,		.ndo_set_mac_address = ipw2100_set_address,
	@@ -6032,7 +6032,7 @@ static struct net_device ipw2100_alloc_device(struct pci_dev pci_dev,
	dev = alloc_ieee80211(sizeof(struct ipw2100_priv));		dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
	if (!dev)		if (!dev)
	return NULL;		return NULL;
	priv = ieee80211_priv(dev);		priv = libipw_priv(dev);
	priv->ieee = netdev_priv(dev);		priv->ieee = netdev_priv(dev);
	priv->pci_dev = pci_dev;		priv->pci_dev = pci_dev;
	priv->net_dev = dev;		priv->net_dev = dev;
	@@ -6046,7 +6046,7 @@ static struct net_device ipw2100_alloc_device(struct pci_dev pci_dev,
	dev->netdev_ops = &ipw2100_netdev_ops;		dev->netdev_ops = &ipw2100_netdev_ops;
	dev->ethtool_ops = &ipw2100_ethtool_ops;		dev->ethtool_ops = &ipw2100_ethtool_ops;
	dev->wireless_handlers = &ipw2100_wx_handler_def;		dev->wireless_handlers = &ipw2100_wx_handler_def;
	priv->wireless_data.ieee80211 = priv->ieee;		priv->wireless_data.libipw = priv->ieee;
	dev->wireless_data = &priv->wireless_data;		dev->wireless_data = &priv->wireless_data;
	dev->watchdog_timeo = 3 * HZ;		dev->watchdog_timeo = 3 * HZ;
	dev->irq = 0;		dev->irq = 0;
	@@ -6202,7 +6202,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
	return err;		return err;
	}		}

	priv = ieee80211_priv(dev);		priv = libipw_priv(dev);

	pci_set_master(pci_dev);		pci_set_master(pci_dev);
	pci_set_drvdata(pci_dev, priv);		pci_set_drvdata(pci_dev, priv);
	@@ -6629,7 +6629,7 @@ static int ipw2100_wx_get_name(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	if (!(priv->status & STATUS_ASSOCIATED))		if (!(priv->status & STATUS_ASSOCIATED))
	strcpy(wrqu->name, "unassociated");		strcpy(wrqu->name, "unassociated");
	else		else
	@@ -6643,7 +6643,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct iw_freq *fwrq = &wrqu->freq;		struct iw_freq *fwrq = &wrqu->freq;
	int err = 0;		int err = 0;

	@@ -6693,7 +6693,7 @@ static int ipw2100_wx_get_freq(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->freq.e = 0;		wrqu->freq.e = 0;

	@@ -6714,7 +6714,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0;		int err = 0;

	IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);		IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
	@@ -6757,7 +6757,7 @@ static int ipw2100_wx_get_mode(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->mode = priv->ieee->iw_mode;		wrqu->mode = priv->ieee->iw_mode;
	IPW_DEBUG_WX("GET Mode -> %d\n", wrqu->mode);		IPW_DEBUG_WX("GET Mode -> %d\n", wrqu->mode);
	@@ -6792,7 +6792,7 @@ static int ipw2100_wx_get_range(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct iw_range range = (struct iw_range )extra;		struct iw_range range = (struct iw_range )extra;
	u16 val;		u16 val;
	int i, level;		int i, level;
	@@ -6913,7 +6913,7 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0;		int err = 0;

	static const unsigned char any[] = {		static const unsigned char any[] = {
	@@ -6962,7 +6962,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	/* If we are associated, trying to associate, or have a statically		/* If we are associated, trying to associate, or have a statically
	* configured BSSID then return that; otherwise return ANY */		* configured BSSID then return that; otherwise return ANY */
	@@ -6980,7 +6980,7 @@ static int ipw2100_wx_set_essid(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	char essid = ""; / ANY */		char essid = ""; / ANY */
	int length = 0;		int length = 0;
	int err = 0;		int err = 0;
	@@ -7035,7 +7035,7 @@ static int ipw2100_wx_get_essid(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	DECLARE_SSID_BUF(ssid);		DECLARE_SSID_BUF(ssid);

	/* If we are associated, trying to associate, or have a statically		/* If we are associated, trying to associate, or have a statically
	@@ -7063,7 +7063,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	if (wrqu->data.length > IW_ESSID_MAX_SIZE)		if (wrqu->data.length > IW_ESSID_MAX_SIZE)
	return -E2BIG;		return -E2BIG;
	@@ -7085,7 +7085,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->data.length = strlen(priv->nick);		wrqu->data.length = strlen(priv->nick);
	memcpy(extra, priv->nick, wrqu->data.length);		memcpy(extra, priv->nick, wrqu->data.length);
	@@ -7100,7 +7100,7 @@ static int ipw2100_wx_set_rate(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	u32 target_rate = wrqu->bitrate.value;		u32 target_rate = wrqu->bitrate.value;
	u32 rate;		u32 rate;
	int err = 0;		int err = 0;
	@@ -7140,7 +7140,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int val;		int val;
	unsigned int len = sizeof(val);		unsigned int len = sizeof(val);
	int err = 0;		int err = 0;
	@@ -7192,7 +7192,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int value, err;		int value, err;

	/* Auto RTS not yet supported */		/* Auto RTS not yet supported */
	@@ -7231,7 +7231,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;		wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;
	wrqu->rts.fixed = 1; /* no auto select */		wrqu->rts.fixed = 1; /* no auto select */
	@@ -7248,7 +7248,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0, value;		int err = 0, value;

	if (ipw_radio_kill_sw(priv, wrqu->txpower.disabled))		if (ipw_radio_kill_sw(priv, wrqu->txpower.disabled))
	@@ -7293,7 +7293,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->txpower.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;		wrqu->txpower.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;

	@@ -7320,7 +7320,7 @@ static int ipw2100_wx_set_frag(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	if (!wrqu->frag.fixed)		if (!wrqu->frag.fixed)
	return -EINVAL;		return -EINVAL;
	@@ -7350,7 +7350,7 @@ static int ipw2100_wx_get_frag(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	wrqu->frag.value = priv->frag_threshold & ~FRAG_DISABLED;		wrqu->frag.value = priv->frag_threshold & ~FRAG_DISABLED;
	wrqu->frag.fixed = 0; /* no auto select */		wrqu->frag.fixed = 0; /* no auto select */
	wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;		wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
	@@ -7364,7 +7364,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0;		int err = 0;

	if (wrqu->retry.flags & IW_RETRY_LIFETIME \|\| wrqu->retry.disabled)		if (wrqu->retry.flags & IW_RETRY_LIFETIME \|\| wrqu->retry.disabled)
	@@ -7412,7 +7412,7 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	wrqu->retry.disabled = 0; /* can't be disabled */		wrqu->retry.disabled = 0; /* can't be disabled */

	@@ -7440,7 +7440,7 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0;		int err = 0;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -7472,8 +7472,8 @@ static int ipw2100_wx_get_scan(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);		return libipw_wx_get_scan(priv->ieee, info, wrqu, extra);
	}		}

	/*		/*
	@@ -7487,8 +7487,8 @@ static int ipw2100_wx_set_encode(struct net_device *dev,
	* No check of STATUS_INITIALIZED required		* No check of STATUS_INITIALIZED required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);		return libipw_wx_set_encode(priv->ieee, info, wrqu, key);
	}		}

	static int ipw2100_wx_get_encode(struct net_device *dev,		static int ipw2100_wx_get_encode(struct net_device *dev,
	@@ -7499,15 +7499,15 @@ static int ipw2100_wx_get_encode(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);		return libipw_wx_get_encode(priv->ieee, info, wrqu, key);
	}		}

	static int ipw2100_wx_set_power(struct net_device *dev,		static int ipw2100_wx_set_power(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0;		int err = 0;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -7556,7 +7556,7 @@ static int ipw2100_wx_get_power(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	if (!(priv->power_mode & IPW_POWER_ENABLED))		if (!(priv->power_mode & IPW_POWER_ENABLED))
	wrqu->power.disabled = 1;		wrqu->power.disabled = 1;
	@@ -7580,8 +7580,8 @@ static int ipw2100_wx_set_genie(struct net_device *dev,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct ieee80211_device *ieee = priv->ieee;		struct libipw_device *ieee = priv->ieee;
	u8 *buf;		u8 *buf;

	if (!ieee->wpa_enabled)		if (!ieee->wpa_enabled)
	@@ -7615,8 +7615,8 @@ static int ipw2100_wx_get_genie(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct ieee80211_device *ieee = priv->ieee;		struct libipw_device *ieee = priv->ieee;

	if (ieee->wpa_ie_len == 0 \|\| ieee->wpa_ie == NULL) {		if (ieee->wpa_ie_len == 0 \|\| ieee->wpa_ie == NULL) {
	wrqu->data.length = 0;		wrqu->data.length = 0;
	@@ -7637,8 +7637,8 @@ static int ipw2100_wx_set_auth(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct ieee80211_device *ieee = priv->ieee;		struct libipw_device *ieee = priv->ieee;
	struct iw_param *param = &wrqu->param;		struct iw_param *param = &wrqu->param;
	struct lib80211_crypt_data *crypt;		struct lib80211_crypt_data *crypt;
	unsigned long flags;		unsigned long flags;
	@@ -7682,7 +7682,7 @@ static int ipw2100_wx_set_auth(struct net_device *dev,
	* can use this to determine if the CAP_PRIVACY_ON bit should		* can use this to determine if the CAP_PRIVACY_ON bit should
	* be set.		* be set.
	*/		*/
	struct ieee80211_security sec = {		struct libipw_security sec = {
	.flags = SEC_ENABLED,		.flags = SEC_ENABLED,
	.enabled = param->value,		.enabled = param->value,
	};		};
	@@ -7730,8 +7730,8 @@ static int ipw2100_wx_get_auth(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct ieee80211_device *ieee = priv->ieee;		struct libipw_device *ieee = priv->ieee;
	struct lib80211_crypt_data *crypt;		struct lib80211_crypt_data *crypt;
	struct iw_param *param = &wrqu->param;		struct iw_param *param = &wrqu->param;
	int ret = 0;		int ret = 0;
	@@ -7792,8 +7792,8 @@ static int ipw2100_wx_set_encodeext(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ieee80211_wx_set_encodeext(priv->ieee, info, wrqu, extra);		return libipw_wx_set_encodeext(priv->ieee, info, wrqu, extra);
	}		}

	/* SIOCGIWENCODEEXT */		/* SIOCGIWENCODEEXT */
	@@ -7801,8 +7801,8 @@ static int ipw2100_wx_get_encodeext(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	return ieee80211_wx_get_encodeext(priv->ieee, info, wrqu, extra);		return libipw_wx_get_encodeext(priv->ieee, info, wrqu, extra);
	}		}

	/* SIOCSIWMLME */		/* SIOCSIWMLME */
	@@ -7810,7 +7810,7 @@ static int ipw2100_wx_set_mlme(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct iw_mlme mlme = (struct iw_mlme )extra;		struct iw_mlme mlme = (struct iw_mlme )extra;
	__le16 reason;		__le16 reason;

	@@ -7841,7 +7841,7 @@ static int ipw2100_wx_set_promisc(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int parms = (int )extra;		int parms = (int )extra;
	int enable = (parms[0] > 0);		int enable = (parms[0] > 0);
	int err = 0;		int err = 0;
	@@ -7872,7 +7872,7 @@ static int ipw2100_wx_reset(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	if (priv->status & STATUS_INITIALIZED)		if (priv->status & STATUS_INITIALIZED)
	schedule_reset(priv);		schedule_reset(priv);
	return 0;		return 0;
	@@ -7884,7 +7884,7 @@ static int ipw2100_wx_set_powermode(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err = 0, mode = (int )extra;		int err = 0, mode = (int )extra;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -7912,7 +7912,7 @@ static int ipw2100_wx_get_powermode(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int level = IPW_POWER_LEVEL(priv->power_mode);		int level = IPW_POWER_LEVEL(priv->power_mode);
	s32 timeout, period;		s32 timeout, period;

	@@ -7948,7 +7948,7 @@ static int ipw2100_wx_set_preamble(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err, mode = (int )extra;		int err, mode = (int )extra;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -7981,7 +7981,7 @@ static int ipw2100_wx_get_preamble(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	if (priv->config & CFG_LONG_PREAMBLE)		if (priv->config & CFG_LONG_PREAMBLE)
	snprintf(wrqu->name, IFNAMSIZ, "long (1)");		snprintf(wrqu->name, IFNAMSIZ, "long (1)");
	@@ -7996,7 +7996,7 @@ static int ipw2100_wx_set_crc_check(struct net_device *dev,
	struct iw_request_info *info,		struct iw_request_info *info,
	union iwreq_data wrqu, char extra)		union iwreq_data wrqu, char extra)
	{		{
	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	int err, mode = (int )extra;		int err, mode = (int )extra;

	mutex_lock(&priv->action_mutex);		mutex_lock(&priv->action_mutex);
	@@ -8028,7 +8028,7 @@ static int ipw2100_wx_get_crc_check(struct net_device *dev,
	* This can be called at any time. No action lock required		* This can be called at any time. No action lock required
	*/		*/

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);

	if (priv->config & CFG_CRC_CHECK)		if (priv->config & CFG_CRC_CHECK)
	snprintf(wrqu->name, IFNAMSIZ, "CRC checked (1)");		snprintf(wrqu->name, IFNAMSIZ, "CRC checked (1)");
	@@ -8181,7 +8181,7 @@ static struct iw_statistics ipw2100_wx_wireless_stats(struct net_device dev)
	int beacon_qual;		int beacon_qual;
	int quality;		int quality;

	struct ipw2100_priv *priv = ieee80211_priv(dev);		struct ipw2100_priv *priv = libipw_priv(dev);
	struct iw_statistics *wstats;		struct iw_statistics *wstats;
	u32 rssi, tx_retries, missed_beacons, tx_failures;		u32 rssi, tx_retries, missed_beacons, tx_failures;
	u32 ord_len = sizeof(u32);		u32 ord_len = sizeof(u32);

drivers/net/wireless/ipw2x00/ipw2100.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@
	#include <linux/workqueue.h>		#include <linux/workqueue.h>
	#include <linux/mutex.h>		#include <linux/mutex.h>

	#include "ieee80211.h"		#include "libipw.h"

	struct ipw2100_priv;		struct ipw2100_priv;
	struct ipw2100_tx_packet;		struct ipw2100_tx_packet;
	@@ -343,7 +343,7 @@ struct ipw2100_tx_packet {
	struct { /* DATA */		struct { /* DATA */
	struct ipw2100_data_header *data;		struct ipw2100_data_header *data;
	dma_addr_t data_phys;		dma_addr_t data_phys;
	struct ieee80211_txb *txb;		struct libipw_txb *txb;
	} d_struct;		} d_struct;
	} info;		} info;
	int jiffy_start;		int jiffy_start;
	@@ -492,7 +492,7 @@ struct ipw2100_priv {
	int stop_hang_check; /* Set 1 when shutting down to kill hang_check */		int stop_hang_check; /* Set 1 when shutting down to kill hang_check */
	int stop_rf_kill; /* Set 1 when shutting down to kill rf_kill */		int stop_rf_kill; /* Set 1 when shutting down to kill rf_kill */

	struct ieee80211_device *ieee;		struct libipw_device *ieee;
	unsigned long status;		unsigned long status;
	unsigned long config;		unsigned long config;
	unsigned long capability;		unsigned long capability;
	@@ -788,7 +788,7 @@ struct ipw2100_priv {
	#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT 100 // 100 milli		#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT 100 // 100 milli
	#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT 100 // 100 milli		#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT 100 // 100 milli

	#define IPW_HEADER_802_11_SIZE sizeof(struct ieee80211_hdr_3addr)		#define IPW_HEADER_802_11_SIZE sizeof(struct libipw_hdr_3addr)
	#define IPW_MAX_80211_PAYLOAD_SIZE 2304U		#define IPW_MAX_80211_PAYLOAD_SIZE 2304U
	#define IPW_MAX_802_11_PAYLOAD_LENGTH 2312		#define IPW_MAX_802_11_PAYLOAD_LENGTH 2312
	#define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH 1536		#define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH 1536
	@@ -803,13 +803,13 @@ struct ipw2100_priv {
	IPW_802_11_FCS_LENGTH)		IPW_802_11_FCS_LENGTH)

	#define IPW_802_11_PAYLOAD_OFFSET \		#define IPW_802_11_PAYLOAD_OFFSET \
	(sizeof(struct ieee80211_hdr_3addr) + \		(sizeof(struct libipw_hdr_3addr) + \
	sizeof(struct ieee80211_snap_hdr))		sizeof(struct libipw_snap_hdr))

	struct ipw2100_rx {		struct ipw2100_rx {
	union {		union {
	unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH];		unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH];
	struct ieee80211_hdr_4addr header;		struct libipw_hdr_4addr header;
	u32 status;		u32 status;
	struct ipw2100_notification notification;		struct ipw2100_notification notification;
	struct ipw2100_cmd_header command;		struct ipw2100_cmd_header command;

drivers/net/wireless/ipw2x00/ipw2200.c

+451 −451

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ipw2x00/ipw2200.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,7 @@

	#include <linux/workqueue.h>		#include <linux/workqueue.h>

	#include "ieee80211.h"		#include "libipw.h"

	/* Authentication and Association States */		/* Authentication and Association States */
	enum connection_manager_assoc_states {		enum connection_manager_assoc_states {
	@@ -365,8 +365,8 @@ enum connection_manager_assoc_states {
	/* QoS sturctures */		/* QoS sturctures */
	struct ipw_qos_info {		struct ipw_qos_info {
	int qos_enable;		int qos_enable;
	struct ieee80211_qos_parameters *def_qos_parm_OFDM;		struct libipw_qos_parameters *def_qos_parm_OFDM;
	struct ieee80211_qos_parameters *def_qos_parm_CCK;		struct libipw_qos_parameters *def_qos_parm_CCK;
	u32 burst_duration_CCK;		u32 burst_duration_CCK;
	u32 burst_duration_OFDM;		u32 burst_duration_OFDM;
	u16 qos_no_ack_mask;		u16 qos_no_ack_mask;
	@@ -534,7 +534,7 @@ typedef void destructor_func(const void *);
	struct clx2_tx_queue {		struct clx2_tx_queue {
	struct clx2_queue q;		struct clx2_queue q;
	struct tfd_frame *bd;		struct tfd_frame *bd;
	struct ieee80211_txb **txb;		struct libipw_txb **txb;
	};		};

	/*		/*
	@@ -1144,7 +1144,7 @@ enum ipw_prom_filter {
	struct ipw_priv;		struct ipw_priv;
	struct ipw_prom_priv {		struct ipw_prom_priv {
	struct ipw_priv *priv;		struct ipw_priv *priv;
	struct ieee80211_device *ieee;		struct libipw_device *ieee;
	enum ipw_prom_filter filter;		enum ipw_prom_filter filter;
	int tx_packets;		int tx_packets;
	int rx_packets;		int rx_packets;
	@@ -1175,7 +1175,7 @@ struct ipw_rt_hdr {

	struct ipw_priv {		struct ipw_priv {
	/* ieee device used by generic ieee processing code */		/* ieee device used by generic ieee processing code */
	struct ieee80211_device *ieee;		struct libipw_device *ieee;

	spinlock_t lock;		spinlock_t lock;
	spinlock_t irq_lock;		spinlock_t irq_lock;
	@@ -1222,7 +1222,7 @@ struct ipw_priv {
	u32 roaming_threshold;		u32 roaming_threshold;

	struct ipw_associate assoc_request;		struct ipw_associate assoc_request;
	struct ieee80211_network *assoc_network;		struct libipw_network *assoc_network;

	unsigned long ts_scan_abort;		unsigned long ts_scan_abort;
	struct ipw_supported_rates rates;		struct ipw_supported_rates rates;

drivers/net/wireless/ipw2x00/ieee80211.h→drivers/net/wireless/ipw2x00/libipw.h

+329 −329

File changed and moved.

Preview size limit exceeded, changes collapsed.