nl80211/cfg80211: WoWLAN support (ff1b6e69) · Commits · 戴 / test

include/linux/nl80211.h

+99 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,14 @@
		* new station with the AUTHENTICATED flag unset and maybe change it later
		* depending on the authentication result.
		*
		* @NL80211_CMD_GET_WOWLAN: get Wake-on-Wireless-LAN (WoWLAN) settings.
		* @NL80211_CMD_SET_WOWLAN: set Wake-on-Wireless-LAN (WoWLAN) settings.
		* Since wireless is more complex than wired ethernet, it supports
		* various triggers. These triggers can be configured through this
		* command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For
		* more background information, see
		* http://wireless.kernel.org/en/users/Documentation/WoWLAN.
		*
		* @NL80211_CMD_MAX: highest used command number
		* @__NL80211_CMD_AFTER_LAST: internal use
		*/
		@@ -534,6 +542,9 @@ enum nl80211_commands {

		NL80211_CMD_NEW_PEER_CANDIDATE,

		NL80211_CMD_GET_WOWLAN,
		NL80211_CMD_SET_WOWLAN,

		/* add new commands above here */

		/* used to define NL80211_CMD_MAX below */
		@@ -903,6 +914,13 @@ enum nl80211_commands {
		* allows auth frames in a mesh to be passed to userspace for processing via
		* the @NL80211_MESH_SETUP_USERSPACE_AUTH flag.
		*
		* @NL80211_ATTR_WOWLAN_SUPPORTED: indicates, as part of the wiphy capabilities,
		* the supported WoWLAN triggers
		* @NL80211_ATTR_WOWLAN_TRIGGERS: used by %NL80211_CMD_SET_WOWLAN to
		* indicate which WoW triggers should be enabled. This is also
		* used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
		* triggers.
		*
		* @NL80211_ATTR_MAX: highest attribute number currently defined
		* @__NL80211_ATTR_AFTER_LAST: internal use
		*/
		@@ -1092,6 +1110,9 @@ enum nl80211_attrs {

		NL80211_ATTR_SUPPORT_MESH_AUTH,

		NL80211_ATTR_WOWLAN_TRIGGERS,
		NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED,

		/* add attributes here, update the policy in nl80211.c */

		__NL80211_ATTR_AFTER_LAST,
		@@ -2061,4 +2082,82 @@ enum nl80211_tx_power_setting {
		NL80211_TX_POWER_FIXED,
		};

		/**
		* enum nl80211_wowlan_packet_pattern_attr - WoWLAN packet pattern attribute
		* @__NL80211_WOWLAN_PKTPAT_INVALID: invalid number for nested attribute
		* @NL80211_WOWLAN_PKTPAT_PATTERN: the pattern, values where the mask has
		* a zero bit are ignored
		* @NL80211_WOWLAN_PKTPAT_MASK: pattern mask, must be long enough to have
		* a bit for each byte in the pattern. The lowest-order bit corresponds
		* to the first byte of the pattern, but the bytes of the pattern are
		* in a little-endian-like format, i.e. the 9th byte of the pattern
		* corresponds to the lowest-order bit in the second byte of the mask.
		* For example: The match 00:xx:00:00:xx:00:00:00:00:xx:xx:xx (where
		* xx indicates "don't care") would be represented by a pattern of
		* twelve zero bytes, and a mask of "0xed,0x07".
		* Note that the pattern matching is done as though frames were not
		* 802.11 frames but 802.3 frames, i.e. the frame is fully unpacked
		* first (including SNAP header unpacking) and then matched.
		* @NUM_NL80211_WOWLAN_PKTPAT: number of attributes
		* @MAX_NL80211_WOWLAN_PKTPAT: max attribute number
		*/
		enum nl80211_wowlan_packet_pattern_attr {
		__NL80211_WOWLAN_PKTPAT_INVALID,
		NL80211_WOWLAN_PKTPAT_MASK,
		NL80211_WOWLAN_PKTPAT_PATTERN,

		NUM_NL80211_WOWLAN_PKTPAT,
		MAX_NL80211_WOWLAN_PKTPAT = NUM_NL80211_WOWLAN_PKTPAT - 1,
		};

		/**
		* struct nl80211_wowlan_pattern_support - pattern support information
		* @max_patterns: maximum number of patterns supported
		* @min_pattern_len: minimum length of each pattern
		* @max_pattern_len: maximum length of each pattern
		*
		* This struct is carried in %NL80211_WOWLAN_TRIG_PKT_PATTERN when
		* that is part of %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED in the
		* capability information given by the kernel to userspace.
		*/
		struct nl80211_wowlan_pattern_support {
		__u32 max_patterns;
		__u32 min_pattern_len;
		__u32 max_pattern_len;
		} __attribute__((packed));

		/**
		* enum nl80211_wowlan_triggers - WoWLAN trigger definitions
		* @__NL80211_WOWLAN_TRIG_INVALID: invalid number for nested attributes
		* @NL80211_WOWLAN_TRIG_ANY: wake up on any activity, do not really put
		* the chip into a special state -- works best with chips that have
		* support for low-power operation already (flag)
		* @NL80211_WOWLAN_TRIG_DISCONNECT: wake up on disconnect, the way disconnect
		* is detected is implementation-specific (flag)
		* @NL80211_WOWLAN_TRIG_MAGIC_PKT: wake up on magic packet (6x 0xff, followed
		* by 16 repetitions of MAC addr, anywhere in payload) (flag)
		* @NL80211_WOWLAN_TRIG_PKT_PATTERN: wake up on the specified packet patterns
		* which are passed in an array of nested attributes, each nested attribute
		* defining a with attributes from &struct nl80211_wowlan_trig_pkt_pattern.
		* Each pattern defines a wakeup packet. The matching is done on the MSDU,
		* i.e. as though the packet was an 802.3 packet, so the pattern matching
		* is done after the packet is converted to the MSDU.
		*
		* In %NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED, it is a binary attribute
		* carrying a &struct nl80211_wowlan_pattern_support.
		* @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers
		* @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number
		*/
		enum nl80211_wowlan_triggers {
		__NL80211_WOWLAN_TRIG_INVALID,
		NL80211_WOWLAN_TRIG_ANY,
		NL80211_WOWLAN_TRIG_DISCONNECT,
		NL80211_WOWLAN_TRIG_MAGIC_PKT,
		NL80211_WOWLAN_TRIG_PKT_PATTERN,

		/* keep last */
		NUM_NL80211_WOWLAN_TRIG,
		MAX_NL80211_WOWLAN_TRIG = NUM_NL80211_WOWLAN_TRIG - 1
		};

		#endif /* __LINUX_NL80211_H */

include/net/cfg80211.h

+72 −2

Original line number	Diff line number	Diff line
		@@ -1087,6 +1087,38 @@ struct cfg80211_pmksa {
		u8 *pmkid;
		};

		/**
		* struct cfg80211_wowlan_trig_pkt_pattern - packet pattern
		* @mask: bitmask where to match pattern and where to ignore bytes,
		* one bit per byte, in same format as nl80211
		* @pattern: bytes to match where bitmask is 1
		* @pattern_len: length of pattern (in bytes)
		*
		* Internal note: @mask and @pattern are allocated in one chunk of
		* memory, free @mask only!
		*/
		struct cfg80211_wowlan_trig_pkt_pattern {
		u8 mask, pattern;
		int pattern_len;
		};

		/**
		* struct cfg80211_wowlan - Wake on Wireless-LAN support info
		*
		* This structure defines the enabled WoWLAN triggers for the device.
		* @any: wake up on any activity -- special trigger if device continues
		* operating as normal during suspend
		* @disconnect: wake up if getting disconnected
		* @magic_pkt: wake up on receiving magic packet
		* @patterns: wake up on receiving packet matching a pattern
		* @n_patterns: number of patterns
		*/
		struct cfg80211_wowlan {
		bool any, disconnect, magic_pkt;
		struct cfg80211_wowlan_trig_pkt_pattern *patterns;
		int n_patterns;
		};

		/**
		* struct cfg80211_ops - backend description for wireless configuration
		*
		@@ -1100,7 +1132,9 @@ struct cfg80211_pmksa {
		* wireless extensions but this is subject to reevaluation as soon as this
		* code is used more widely and we have a first user without wext.
		*
		* @suspend: wiphy device needs to be suspended
		* @suspend: wiphy device needs to be suspended. The variable @wow will
		* be %NULL or contain the enabled Wake-on-Wireless triggers that are
		* configured for the device.
		* @resume: wiphy device needs to be resumed
		*
		* @add_virtual_intf: create a new virtual interface with the given name,
		@@ -1244,7 +1278,7 @@ struct cfg80211_pmksa {
		* @get_ringparam: Get tx and rx ring current and maximum sizes.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy);
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		int (resume)(struct wiphy wiphy);

		struct net_device * (add_virtual_intf)(struct wiphy wiphy,
		@@ -1479,6 +1513,38 @@ struct ieee80211_txrx_stypes {
		u16 tx, rx;
		};

		/**
		* enum wiphy_wowlan_support_flags - WoWLAN support flags
		* @WIPHY_WOWLAN_ANY: supports wakeup for the special "any"
		* trigger that keeps the device operating as-is and
		* wakes up the host on any activity, for example a
		* received packet that passed filtering; note that the
		* packet should be preserved in that case
		* @WIPHY_WOWLAN_MAGIC_PKT: supports wakeup on magic packet
		* (see nl80211.h)
		* @WIPHY_WOWLAN_DISCONNECT: supports wakeup on disconnect
		*/
		enum wiphy_wowlan_support_flags {
		WIPHY_WOWLAN_ANY = BIT(0),
		WIPHY_WOWLAN_MAGIC_PKT = BIT(1),
		WIPHY_WOWLAN_DISCONNECT = BIT(2),
		};

		/**
		* struct wiphy_wowlan_support - WoWLAN support data
		* @flags: see &enum wiphy_wowlan_support_flags
		* @n_patterns: number of supported wakeup patterns
		* (see nl80211.h for the pattern definition)
		* @pattern_max_len: maximum length of each pattern
		* @pattern_min_len: minimum length of each pattern
		*/
		struct wiphy_wowlan_support {
		u32 flags;
		int n_patterns;
		int pattern_max_len;
		int pattern_min_len;
		};

		/**
		* struct wiphy - wireless hardware description
		* @reg_notifier: the driver's regulatory notification callback,
		@@ -1546,6 +1612,8 @@ struct ieee80211_txrx_stypes {
		*
		* @max_remain_on_channel_duration: Maximum time a remain-on-channel operation
		* may request, if implemented.
		*
		* @wowlan: WoWLAN support information
		*/
		struct wiphy {
		/* assign these fields before you register the wiphy */
		@@ -1583,6 +1651,8 @@ struct wiphy {
		char fw_version[ETHTOOL_BUSINFO_LEN];
		u32 hw_version;

		struct wiphy_wowlan_support wowlan;

		u16 max_remain_on_channel_duration;

		u8 max_num_pmkids;

net/mac80211/cfg.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1297,7 +1297,8 @@ static int ieee80211_set_channel(struct wiphy *wiphy,
		}

		#ifdef CONFIG_PM
		static int ieee80211_suspend(struct wiphy *wiphy)
		static int ieee80211_suspend(struct wiphy *wiphy,
		struct cfg80211_wowlan *wowlan)
		{
		return __ieee80211_suspend(wiphy_priv(wiphy));
		}

net/wireless/core.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -493,6 +493,13 @@ int wiphy_register(struct wiphy *wiphy)
		return -EINVAL;
		}

		if (rdev->wiphy.wowlan.n_patterns) {
		if (WARN_ON(!rdev->wiphy.wowlan.pattern_min_len \|\|
		rdev->wiphy.wowlan.pattern_min_len >
		rdev->wiphy.wowlan.pattern_max_len))
		return -EINVAL;
		}

		/* check and set up bitrates */
		ieee80211_set_bitrate_flags(wiphy);

		@@ -631,6 +638,7 @@ void cfg80211_dev_free(struct cfg80211_registered_device *rdev)
		mutex_destroy(&rdev->devlist_mtx);
		list_for_each_entry_safe(scan, tmp, &rdev->bss_list, list)
		cfg80211_put_bss(&scan->pub);
		cfg80211_rdev_free_wowlan(rdev);
		kfree(rdev);
		}

net/wireless/core.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ struct cfg80211_registered_device {
		struct work_struct conn_work;
		struct work_struct event_work;

		struct cfg80211_wowlan *wowlan;

		/* must be last because of the way we do wiphy_priv(),
		* and it should at least be aligned to NETDEV_ALIGN */
		struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
		@@ -89,6 +91,18 @@ bool wiphy_idx_valid(int wiphy_idx)
		return wiphy_idx >= 0;
		}

		static inline void
		cfg80211_rdev_free_wowlan(struct cfg80211_registered_device *rdev)
		{
		int i;

		if (!rdev->wowlan)
		return;
		for (i = 0; i < rdev->wowlan->n_patterns; i++)
		kfree(rdev->wowlan->patterns[i].mask);
		kfree(rdev->wowlan->patterns);
		kfree(rdev->wowlan);
		}

		extern struct workqueue_struct *cfg80211_wq;
		extern struct mutex cfg80211_mutex;

Admin message