/spare/repo/netdev-2.6 branch 'ieee80211' (b4bf3430) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ config IPW2100
		say M here and read <file:Documentation/modules.txt>. The module
		will be called ipw2100.ko.

		config IPW2100_PROMISC
		config IPW2100_MONITOR
		bool "Enable promiscuous mode"
		depends on IPW2100
		---help---

drivers/net/wireless/atmel.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ static int start_tx (struct sk_buff skb, struct net_device dev)
		header.duration_id = 0;
		header.seq_ctl = 0;
		if (priv->wep_is_on)
		frame_ctl \|= IEEE80211_FCTL_WEP;
		frame_ctl \|= IEEE80211_FCTL_PROTECTED;
		if (priv->operating_mode == IW_MODE_ADHOC) {
		memcpy(&header.addr1, skb->data, 6);
		memcpy(&header.addr2, dev->dev_addr, 6);
		@@ -1117,7 +1117,7 @@ static void rx_done_irq(struct atmel_private *priv)
		/* probe for CRC use here if needed once five packets have arrived with
		the same crc status, we assume we know what's happening and stop probing */
		if (priv->probe_crc) {
		if (!priv->wep_is_on \|\| !(frame_ctl & IEEE80211_FCTL_WEP)) {
		if (!priv->wep_is_on \|\| !(frame_ctl & IEEE80211_FCTL_PROTECTED)) {
		priv->do_rx_crc = probe_crc(priv, rx_packet_loc, msdu_size);
		} else {
		priv->do_rx_crc = probe_crc(priv, rx_packet_loc + 24, msdu_size - 24);
		@@ -1132,7 +1132,7 @@ static void rx_done_irq(struct atmel_private *priv)
		}

		/* don't CRC header when WEP in use */
		if (priv->do_rx_crc && (!priv->wep_is_on \|\| !(frame_ctl & IEEE80211_FCTL_WEP))) {
		if (priv->do_rx_crc && (!priv->wep_is_on \|\| !(frame_ctl & IEEE80211_FCTL_PROTECTED))) {
		crc = crc32_le(0xffffffff, (unsigned char *)&header, 24);
		}
		msdu_size -= 24; /* header */
		@@ -2677,7 +2677,7 @@ static void send_authentication_request(struct atmel_private priv, u8 challeng
		auth.alg = cpu_to_le16(C80211_MGMT_AAN_SHAREDKEY);
		/* no WEP for authentication frames with TrSeqNo 1 */
		if (priv->CurrentAuthentTransactionSeqNum != 1)
		header.frame_ctl \|= cpu_to_le16(IEEE80211_FCTL_WEP);
		header.frame_ctl \|= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
		} else {
		auth.alg = cpu_to_le16(C80211_MGMT_AAN_OPENSYSTEM);
		}

drivers/net/wireless/ipw2100.c

+147 −109

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ipw2100.h

+0 −28

Original line number	Diff line number	Diff line
		@@ -48,22 +48,6 @@ struct ipw2100_priv;
		struct ipw2100_tx_packet;
		struct ipw2100_rx_packet;

		#ifdef CONFIG_IPW_DEBUG
		enum { IPW_DEBUG_ENABLED = 1 };
		extern u32 ipw2100_debug_level;
		#define IPW_DEBUG(level, message...) \
		do { \
		if (ipw2100_debug_level & (level)) { \
		printk(KERN_DEBUG "ipw2100: %c %s ", \
		in_interrupt() ? 'I' : 'U', __FUNCTION__); \
		printk(message); \
		} \
		} while (0)
		#else
		enum { IPW_DEBUG_ENABLED = 0 };
		#define IPW_DEBUG(level, message...) do {} while (0)
		#endif /* CONFIG_IPW_DEBUG */

		#define IPW_DL_UNINIT 0x80000000
		#define IPW_DL_NONE 0x00000000
		#define IPW_DL_ALL 0x7FFFFFFF
		@@ -1144,10 +1128,6 @@ typedef enum _ORDINAL_TABLE_2 { // NS - means Not Supported by FW
		#define WIRELESS_SPY // enable iwspy support
		#endif

		extern struct iw_handler_def ipw2100_wx_handler_def;
		extern struct iw_statistics ipw2100_wx_wireless_stats(struct net_device dev);
		extern void ipw2100_wx_event_work(struct ipw2100_priv *priv);

		#define IPW_HOST_FW_SHARED_AREA0 0x0002f200
		#define IPW_HOST_FW_SHARED_AREA0_END 0x0002f510 // 0x310 bytes

		@@ -1182,14 +1162,6 @@ struct ipw2100_fw {
		const struct firmware *fw_entry;
		};

		int ipw2100_get_firmware(struct ipw2100_priv priv, struct ipw2100_fw fw);
		void ipw2100_release_firmware(struct ipw2100_priv priv, struct ipw2100_fw fw);
		int ipw2100_fw_download(struct ipw2100_priv priv, struct ipw2100_fw fw);
		int ipw2100_ucode_download(struct ipw2100_priv priv, struct ipw2100_fw fw);

		#define MAX_FW_VERSION_LEN 14

		int ipw2100_get_fwversion(struct ipw2100_priv priv, char buf, size_t max);
		int ipw2100_get_ucodeversion(struct ipw2100_priv priv, char buf, size_t max);

		#endif /* _IPW2100_H */

drivers/net/wireless/ipw2200.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -4485,7 +4485,7 @@ static void ipw_debug_config(struct ipw_priv *priv)
		IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
		}
		#else
		#define ipw_debug_config(x) do {} while (0);
		#define ipw_debug_config(x) do {} while (0)
		#endif

		static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
		@@ -6617,11 +6617,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)
		{
		int ret = 0;

		#ifdef CONFIG_SOFTWARE_SUSPEND2
		priv->workqueue = create_workqueue(DRV_NAME, 0);
		#else
		priv->workqueue = create_workqueue(DRV_NAME);
		#endif
		init_waitqueue_head(&priv->wait_command_queue);

		INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv);
		@@ -7242,11 +7238,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
		/* Remove the PRESENT state of the device */
		netif_device_detach(dev);

		#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
		pci_save_state(pdev, priv->pm_state);
		#else
		pci_save_state(pdev);
		#endif
		pci_disable_device(pdev);
		pci_set_power_state(pdev, state);