Merge branch 'upstream-fixes' of... (c1cb0b77) · Commits · 戴 / test

drivers/net/wireless/zd1211rw/zd_ieee80211.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ struct cck_plcp_header {
		u8 service;
		__le16 length;
		__le16 crc16;
		};
		} __attribute__((packed));

		static inline u8 zd_cck_plcp_header_rate(const struct cck_plcp_header *header)
		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,7 @@ struct zd_rt_hdr {
		u8 rt_rate;
		u16 rt_channel;
		u16 rt_chbitmask;
		};
		} __attribute__((packed));

		static void fill_rt_header(void buffer, struct zd_mac mac,
		const struct ieee80211_rx_stats *stats,

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ struct zd_ctrlset {
		struct rx_length_info {
		__le16 length[3];
		__le16 tag;
		};
		} __attribute__((packed));

		#define RX_LENGTH_INFO_TAG 0x697e

		@@ -93,7 +93,7 @@ struct rx_status {
		u8 signal_quality_ofdm;
		u8 decryption_type;
		u8 frame_status;
		};
		} __attribute__((packed));

		/* rx_status field decryption_type */
		#define ZD_RX_NO_WEP 0

+13 −13

Original line number	Diff line number	Diff line
		@@ -366,15 +366,6 @@ error:
		return r;
		}

		static void disable_read_regs_int(struct zd_usb *usb)
		{
		struct zd_usb_interrupt *intr = &usb->intr;

		spin_lock(&intr->lock);
		intr->read_regs_enabled = 0;
		spin_unlock(&intr->lock);
		}

		#define urb_dev(urb) (&(urb)->dev->dev)

		static inline void handle_regs_int(struct urb *urb)
		@@ -1156,10 +1147,19 @@ static void prepare_read_regs_int(struct zd_usb *usb)
		{
		struct zd_usb_interrupt *intr = &usb->intr;

		spin_lock(&intr->lock);
		spin_lock_irq(&intr->lock);
		intr->read_regs_enabled = 1;
		INIT_COMPLETION(intr->read_regs.completion);
		spin_unlock(&intr->lock);
		spin_unlock_irq(&intr->lock);
		}

		static void disable_read_regs_int(struct zd_usb *usb)
		{
		struct zd_usb_interrupt *intr = &usb->intr;

		spin_lock_irq(&intr->lock);
		intr->read_regs_enabled = 0;
		spin_unlock_irq(&intr->lock);
		}

		static int get_results(struct zd_usb usb, u16 values,
		@@ -1171,7 +1171,7 @@ static int get_results(struct zd_usb usb, u16 values,
		struct read_regs_int *rr = &intr->read_regs;
		struct usb_int_regs regs = (struct usb_int_regs )rr->buffer;

		spin_lock(&intr->lock);
		spin_lock_irq(&intr->lock);

		r = -EIO;
		/* The created block size seems to be larger than expected.
		@@ -1204,7 +1204,7 @@ static int get_results(struct zd_usb usb, u16 values,

		r = 0;
		error_unlock:
		spin_unlock(&intr->lock);
		spin_unlock_irq(&intr->lock);
		return r;
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -74,17 +74,17 @@ enum control_requests {
		struct usb_req_read_regs {
		__le16 id;
		__le16 addr[0];
		};
		} __attribute__((packed));

		struct reg_data {
		__le16 addr;
		__le16 value;
		};
		} __attribute__((packed));

		struct usb_req_write_regs {
		__le16 id;
		struct reg_data reg_writes[0];
		};
		} __attribute__((packed));

		enum {
		RF_IF_LE = 0x02,
		@@ -101,7 +101,7 @@ struct usb_req_rfwrite {
		/* RF2595: 24 */
		__le16 bit_values[0];
		/* (CR203 & ~(RF_IF_LE \| RF_CLK \| RF_DATA)) \| (bit ? RF_DATA : 0) */
		};
		} __attribute__((packed));

		/* USB interrupt */

		@@ -118,12 +118,12 @@ enum usb_int_flags {
		struct usb_int_header {
		u8 type; /* must always be 1 */
		u8 id;
		};
		} __attribute__((packed));

		struct usb_int_regs {
		struct usb_int_header hdr;
		struct reg_data regs[0];
		};
		} __attribute__((packed));

		struct usb_int_retry_fail {
		struct usb_int_header hdr;
		@@ -131,7 +131,7 @@ struct usb_int_retry_fail {
		u8 _dummy;
		u8 addr[ETH_ALEN];
		u8 ibss_wakeup_dest;
		};
		} __attribute__((packed));

		struct read_regs_int {
		struct completion completion;