1 files changed, 26 insertions, 0 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 725af7a468d2..3c61060a4d2b 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3,6 +3,7 @@
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2013-2014  Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -1014,6 +1015,31 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
                         }
                         elems->pwr_constr_elem = pos;
                         break;
+                case WLAN_EID_CISCO_VENDOR_SPECIFIC:
+                        /* Lots of different options exist, but we only care
+                         * about the Dynamic Transmit Power Control element.
+                         * First check for the Cisco OUI, then for the DTPC
+                         * tag (0x00).
+                         */
+                        if (elen < 4) {
+                                elem_parse_failed = true;
+                                break;
+                        }
+
+                        if (pos[0] != 0x00 || pos[1] != 0x40 ||
+                            pos[2] != 0x96 || pos[3] != 0x00)
+                                break;
+
+                        if (elen != 6) {
+                                elem_parse_failed = true;
+                                break;
+                        }
+
+                        if (calc_crc)
+                                crc = crc32_be(crc, pos - 2, elen + 2);
+
+                        elems->cisco_dtpc_elem = pos;
+                        break;
                 case WLAN_EID_TIMEOUT_INTERVAL:
                         if (elen >= sizeof(struct ieee80211_timeout_interval_ie))
                                 elems->timeout_int = (void *)pos;