summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch
new file mode 100644
index 00000000..68fca84d
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.24/0006-net-wireless-ipw2x00-add-supported-cipher-suites-to-.patch
@@ -0,0 +1,102 @@
1From 54490f32c07630f7c6bd6429bf73d7507b06e3db Mon Sep 17 00:00:00 2001
2From: Stanislav Yakovlev <stas.yakovlev@gmail.com>
3Date: Tue, 10 Apr 2012 21:44:47 -0400
4Subject: [PATCH 006/109] net/wireless: ipw2x00: add supported cipher suites
5 to wiphy initialization
6
7commit a141e6a0097118bb35024485f1faffc0d9042f5c upstream.
8
9Driver doesn't report its supported cipher suites through cfg80211
10interface. It still uses wext interface and probably will not work
11through nl80211, but will at least correctly advertise supported
12features.
13
14Bug was reported by Omar Siam.
15https://bugzilla.kernel.org/show_bug.cgi?id=43049
16
17Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>
18Signed-off-by: John W. Linville <linville@tuxdriver.com>
19Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
20---
21 drivers/net/wireless/ipw2x00/ipw.h | 23 +++++++++++++++++++++++
22 drivers/net/wireless/ipw2x00/ipw2100.c | 4 ++++
23 drivers/net/wireless/ipw2x00/ipw2200.c | 4 ++++
24 3 files changed, 31 insertions(+), 0 deletions(-)
25 create mode 100644 drivers/net/wireless/ipw2x00/ipw.h
26
27diff --git a/drivers/net/wireless/ipw2x00/ipw.h b/drivers/net/wireless/ipw2x00/ipw.h
28new file mode 100644
29index 0000000..4007bf5
30--- /dev/null
31+++ b/drivers/net/wireless/ipw2x00/ipw.h
32@@ -0,0 +1,23 @@
33+/*
34+ * Intel Pro/Wireless 2100, 2200BG, 2915ABG network connection driver
35+ *
36+ * Copyright 2012 Stanislav Yakovlev <stas.yakovlev@gmail.com>
37+ *
38+ * This program is free software; you can redistribute it and/or modify
39+ * it under the terms of the GNU General Public License version 2 as
40+ * published by the Free Software Foundation.
41+ */
42+
43+#ifndef __IPW_H__
44+#define __IPW_H__
45+
46+#include <linux/ieee80211.h>
47+
48+static const u32 ipw_cipher_suites[] = {
49+ WLAN_CIPHER_SUITE_WEP40,
50+ WLAN_CIPHER_SUITE_WEP104,
51+ WLAN_CIPHER_SUITE_TKIP,
52+ WLAN_CIPHER_SUITE_CCMP,
53+};
54+
55+#endif
56diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
57index 127e9c6..10862d4 100644
58--- a/drivers/net/wireless/ipw2x00/ipw2100.c
59+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
60@@ -166,6 +166,7 @@ that only one external action is invoked at a time.
61 #include <net/lib80211.h>
62
63 #include "ipw2100.h"
64+#include "ipw.h"
65
66 #define IPW2100_VERSION "git-1.2.2"
67
68@@ -1955,6 +1956,9 @@ static int ipw2100_wdev_init(struct net_device *dev)
69 wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = bg_band;
70 }
71
72+ wdev->wiphy->cipher_suites = ipw_cipher_suites;
73+ wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
74+
75 set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
76 if (wiphy_register(wdev->wiphy)) {
77 ipw2100_down(priv);
78diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
79index 827889b..56bd370 100644
80--- a/drivers/net/wireless/ipw2x00/ipw2200.c
81+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
82@@ -34,6 +34,7 @@
83 #include <linux/slab.h>
84 #include <net/cfg80211-wext.h>
85 #include "ipw2200.h"
86+#include "ipw.h"
87
88
89 #ifndef KBUILD_EXTMOD
90@@ -11535,6 +11536,9 @@ static int ipw_wdev_init(struct net_device *dev)
91 wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = a_band;
92 }
93
94+ wdev->wiphy->cipher_suites = ipw_cipher_suites;
95+ wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
96+
97 set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
98
99 /* With that information in place, we can now register the wiphy... */
100--
1011.7.7.6
102