Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a141e6a0 authored by Stanislav Yakovlev's avatar Stanislav Yakovlev Committed by John W. Linville
Browse files

net/wireless: ipw2x00: add supported cipher suites to wiphy initialization 

Driver doesn't report its supported cipher suites through cfg80211
interface. It still uses wext interface and probably will not work
through nl80211, but will at least correctly advertise supported
features.

Bug was reported by Omar Siam.
https://bugzilla.kernel.org/show_bug.cgi?id=43049



Signed-off-by: default avatarStanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea54a6d6

drivers/net/wireless/ipw2x00/ipw.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Intel Pro/Wireless 2100, 2200BG, 2915ABG network connection driver

 *

 * Copyright 2012 Stanislav Yakovlev <stas.yakovlev@gmail.com>

 *

 * 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

 * published by the Free Software Foundation.

 */



#ifndef __IPW_H__

#define __IPW_H__



#include <linux/ieee80211.h>



static const u32 ipw_cipher_suites[] = {

	WLAN_CIPHER_SUITE_WEP40,

	WLAN_CIPHER_SUITE_WEP104,

	WLAN_CIPHER_SUITE_TKIP,

	WLAN_CIPHER_SUITE_CCMP,

};



#endif

drivers/net/wireless/ipw2x00/ipw2100.c

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ that only one external action is invoked at a time. 
#include <net/lib80211.h>



#include "ipw2100.h"

#include "ipw.h"



#define IPW2100_VERSION "git-1.2.2"
@@ -1946,6 +1947,9 @@ static int ipw2100_wdev_init(struct net_device *dev) 
		wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = bg_band;

	}



	wdev->wiphy->cipher_suites = ipw_cipher_suites;

	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);



	set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);

	if (wiphy_register(wdev->wiphy)) {

		ipw2100_down(priv);

drivers/net/wireless/ipw2x00/ipw2200.c

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/slab.h>

#include <net/cfg80211-wext.h>

#include "ipw2200.h"

#include "ipw.h"





#ifndef KBUILD_EXTMOD
@@ -11532,6 +11533,9 @@ static int ipw_wdev_init(struct net_device *dev) 
		wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = a_band;

	}



	wdev->wiphy->cipher_suites = ipw_cipher_suites;

	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);



	set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);



	/* With that information in place, we can now register the wiphy... */