Please pull 'upstream-fixes' branch of wireless-2.6
Subsystems (5)
The following changes since commit e0f2e3a06be513352cb4955313ed7e55909acd84:
Linus Torvalds (1):
Linux 2.6.21-rc5
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-fixes
David Woodhouse (1):
bcm43xx: Fix machine check on PPC for version 1 PHY
Jean Tourrilhes (2):
wext: Add missing ioctls to 64<->32 conversion WE-22 : prevent information leak on 64 bit
Larry Finger (1):
bcm43xx: Fix code for confusion between PHY revision and PHY version
Stefano Brivio (1):
bcm43xx: fix radio_set_tx_iq
drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 4 +- drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 12 ++-- fs/compat_ioctl.c | 9 +++ include/linux/wireless.h | 21 ++++++- include/net/iw_handler.h | 30 +++++++--- net/core/rtnetlink.c | 3 +- net/core/wireless.c | 82 ++++++++++++++++---------- 7 files changed, 108 insertions(+), 53 deletions(-)
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +2 -2
@@ -757,7 +757,7 @@ static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm)if (radio->version ==0x2050 )bcm43xx_phy_write (bcm,0x0038 ,0x0667 ); -if (phy->type == BCM43xx_PHYTYPE_G) { +if (phy->connected) {if (radio->version ==0x2050 ) {bcm43xx_radio_write16 (bcm,0x007A , bcm43xx_radio_read16(bcm, 0x007A)
@@ -1192,7 +1192,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)bcm43xx_phy_write (bcm,0x0811 ,0x0400 );bcm43xx_phy_write (bcm,0x0015 ,0x00C0 ); } -if (phy->connected) { +if (phy->rev >=2 && phy->connected) { tmp =bcm43xx_phy_read (bcm,0x0400 ) &0xFF ;if (tmp <6 ) {bcm43xx_phy_write (bcm,0x04C2 ,0x1816 );
drivers/net/wireless/bcm43xx/bcm43xx_radio.c +6 -6
@@ -458,7 +458,7 @@ static void bcm43xx_calc_nrssi_offset(struct bcm43xx_private *bcm)bcm43xx_phy_write (bcm,0x005A ,0x0480 );bcm43xx_phy_write (bcm,0x0059 ,0x0810 );bcm43xx_phy_write (bcm,0x0058 ,0x000D ); -if (phy->rev ==0 ) { +if (phy->analog ==0 ) {bcm43xx_phy_write (bcm,0x0003 ,0x0122 ); }else { bcm43xx_phy_write(bcm, 0x000A,
@@ -570,9 +570,9 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm) nrssi0 = (s16 )bcm43xx_phy_read (bcm,0x0027 );bcm43xx_radio_write16 (bcm,0x007A ,bcm43xx_radio_read16 (bcm,0x007A ) &0x007F ); -if (phy->rev >=2 ) { +if (phy->analog >=2 ) {bcm43xx_write16 (bcm,0x03E6 ,0x0040 ); - }else if (phy->rev ==0 ) { + }else if (phy->analog ==0 ) {bcm43xx_write16 (bcm,0x03E6 ,0x0122 ); }else { bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
@@ -596,7 +596,7 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm)bcm43xx_phy_write (bcm,0x0015 , backup[5 ]);bcm43xx_phy_write (bcm,0x002A , backup[6 ]);bcm43xx_synth_pu_workaround (bcm, radio->channel); -if (phy->rev !=0 ) +if (phy->analog !=0 )bcm43xx_write16 (bcm,0x03F4 , backup[13 ]);bcm43xx_phy_write (bcm,0x0020 , backup[7 ]);
@@ -692,7 +692,7 @@ void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm)bcm43xx_radio_write16 (bcm,0x007A ,bcm43xx_radio_read16 (bcm,0x007A ) &0x007F ); -if (phy->rev >=2 ) { +if (phy->analog >=2 ) {bcm43xx_phy_write (bcm,0x0003 , (bcm43xx_phy_read (bcm,0x0003 ) &0xFF9F ) |0x0040 );
@@ -1579,7 +1579,7 @@ void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm)for (i =0 ; i <5 ; i++) {for (j =0 ; j <5 ; j++) { -if (tmp == (data_high[i] <<4 | data_low[j])) { +if (tmp == (data_high[i] | data_low[j])) {bcm43xx_phy_write (bcm,0x0069 , (i - j) <<8 |0x00C0 );return ; }
fs/compat_ioctl.c +9 -0
@@ -2553,11 +2553,15 @@ HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl)HANDLE_IOCTL (I2C_SMBUS , do_i2c_smbus_ioctl) /* wireless */ HANDLE_IOCTL(SIOCGIWRANGE, do_wireless_ioctl) +HANDLE_IOCTL(SIOCGIWPRIV, do_wireless_ioctl) +HANDLE_IOCTL(SIOCGIWSTATS, do_wireless_ioctl) HANDLE_IOCTL(SIOCSIWSPY, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWSPY, do_wireless_ioctl) HANDLE_IOCTL(SIOCSIWTHRSPY, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWTHRSPY, do_wireless_ioctl) +HANDLE_IOCTL(SIOCSIWMLME, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWAPLIST, do_wireless_ioctl) +HANDLE_IOCTL(SIOCSIWSCAN, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWSCAN, do_wireless_ioctl) HANDLE_IOCTL(SIOCSIWESSID, do_wireless_ioctl)HANDLE_IOCTL (SIOCGIWESSID , do_wireless_ioctl)
@@ -2565,6 +2569,11 @@ HANDLE_IOCTL(SIOCSIWNICKN, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWNICKN, do_wireless_ioctl) HANDLE_IOCTL(SIOCSIWENCODE, do_wireless_ioctl) HANDLE_IOCTL(SIOCGIWENCODE, do_wireless_ioctl) +HANDLE_IOCTL(SIOCSIWGENIE, do_wireless_ioctl) +HANDLE_IOCTL(SIOCGIWGENIE, do_wireless_ioctl) +HANDLE_IOCTL(SIOCSIWENCODEEXT, do_wireless_ioctl) +HANDLE_IOCTL(SIOCGIWENCODEEXT, do_wireless_ioctl) +HANDLE_IOCTL(SIOCSIWPMKSA, do_wireless_ioctl) HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl) HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl)HANDLE_IOCTL (RTC_IRQP_READ32 , rtc_ioctl)
include/linux/wireless.h +18 -3
@@ -1,10 +1,10 @@/* * This file define a set of standard wireless extensions * -* Version : 21 14.3.06 +* Version : 22 16.3.07 * * Authors : Jean Tourrilhes - HPL - <[email protected]> -* Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved. +* Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H
@@ -85,7 +85,7 @@* (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ -#define WIRELESS_EXT 21 +#define WIRELESS_EXT 22/* * Changes :
@@ -221,6 +221,10 @@* - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers * - Power/Retry relative values no longer * 100000 * - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI +* +* V21 to V22 +* ---------- +* - Prevent leaking of kernel space in stream on 64 bits. */ /**************************** CONSTANTS ****************************/
@@ -1085,4 +1089,15 @@ struct iw_event#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ IW_EV_POINT_OFF) +/* Size of the Event prefix when packed in stream */ +#define IW_EV_LCP_PK_LEN (4) +/* Size of the various events when packed in stream */ +#define IW_EV_CHAR_PK_LEN (IW_EV_LCP_PK_LEN + IFNAMSIZ) +#define IW_EV_UINT_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(__u32)) +#define IW_EV_FREQ_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_freq)) +#define IW_EV_PARAM_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_param)) +#define IW_EV_ADDR_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr)) +#define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) +#define IW_EV_POINT_PK_LEN (IW_EV_LCP_LEN + 4) +#endif /* _LINUX_WIRELESS_H */
include/net/iw_handler.h +21 -9
@@ -1,10 +1,10 @@/* * This file define the new driver API for Wireless Extensions * -* Version : 7 18.3.05 +* Version : 8 16.3.07 * * Authors : Jean Tourrilhes - HPL - <[email protected]> -* Copyright (c) 2001-2006 Jean Tourrilhes, All Rights Reserved. +* Copyright (c) 2001-2007 Jean Tourrilhes, All Rights Reserved. */ #ifndef _IW_HANDLER_H
@@ -207,7 +207,7 @@* will be needed... * I just plan to increment with each new version. */ -#define IW_HANDLER_VERSION 7 +#define IW_HANDLER_VERSION 8/* * Changes :
@@ -239,6 +239,10 @@* - Remove (struct iw_point *)->pointer from events and streams * - Remove spy_offset from struct iw_handler_def * - Add "check" version of event macros for ieee802.11 stack +* +* V7 to V8 +* ---------- +* - Prevent leaking of kernel space in stream on 64 bits. */ /**************************** CONSTANTS ****************************/
@@ -500,7 +504,11 @@ iwe_stream_add_event(char * stream, /* Stream of events *//* Check if it's possible */ if (likely ((stream + event_len) < ends)) { iwe->len = event_len; -memcpy (stream, (char *) iwe, event_len); +/* Beware of alignement issues on 64 bits */ +memcpy (stream, (char *) iwe,IW_EV_LCP_PK_LEN ); +memcpy (stream +IW_EV_LCP_LEN , + ((char *) iwe) +IW_EV_LCP_LEN , + event_len -IW_EV_LCP_LEN ); stream += event_len; }return stream;
@@ -521,10 +529,10 @@ iwe_stream_add_point(char * stream, /* Stream of events *//* Check if it's possible */ if (likely ((stream + event_len) < ends)) { iwe->len = event_len; -memcpy (stream, (char *) iwe,IW_EV_LCP_LEN ); +memcpy (stream, (char *) iwe,IW_EV_LCP_PK_LEN );memcpy (stream +IW_EV_LCP_LEN , ((char *) iwe) +IW_EV_LCP_LEN +IW_EV_POINT_OFF , -IW_EV_POINT_LEN -IW_EV_LCP_LEN ); +IW_EV_POINT_PK_LEN -IW_EV_LCP_PK_LEN );memcpy (stream +IW_EV_POINT_LEN , extra, iwe->u.data.length); stream += event_len; }
@@ -574,7 +582,11 @@ iwe_stream_check_add_event(char * stream, /* Stream of events *//* Check if it's possible, set error if not */ if (likely ((stream + event_len) < ends)) { iwe->len = event_len; -memcpy (stream, (char *) iwe, event_len); +/* Beware of alignement issues on 64 bits */ +memcpy (stream, (char *) iwe,IW_EV_LCP_PK_LEN ); +memcpy (stream +IW_EV_LCP_LEN , + ((char *) iwe) +IW_EV_LCP_LEN , + event_len -IW_EV_LCP_LEN ); stream += event_len; }else *perr = -E2BIG ;
@@ -598,10 +610,10 @@ iwe_stream_check_add_point(char * stream, /* Stream of events *//* Check if it's possible */ if (likely ((stream + event_len) < ends)) { iwe->len = event_len; -memcpy (stream, (char *) iwe,IW_EV_LCP_LEN ); +memcpy (stream, (char *) iwe,IW_EV_LCP_PK_LEN );memcpy (stream +IW_EV_LCP_LEN , ((char *) iwe) +IW_EV_LCP_LEN +IW_EV_POINT_OFF , -IW_EV_POINT_LEN -IW_EV_LCP_LEN ); +IW_EV_POINT_PK_LEN -IW_EV_LCP_PK_LEN );memcpy (stream +IW_EV_POINT_LEN , extra, iwe->u.data.length); stream += event_len; }else
net/core/rtnetlink.c +2 -1
@@ -621,7 +621,8 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)if (err <0 ) goto errout; - iw += IW_EV_POINT_OFF; +/* Payload is at an offset in buffer */ + iw = iw_buf + IW_EV_POINT_OFF; }#endif /* CONFIG_NET_WIRELESS_RTNETLINK */
net/core/wireless.c +50 -32
216 lines not on this page · raw message
Signature · 2 lines
John W. Linville [email protected]
Please pull 'upstream' branch of wireless-2.6
The following changes since commit b1944354101f15f4afeffd842e12c7d70fb7e822:
John W. Linville (1):
Merge branch 'upstream-fixes' into upstream
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
Daniel Drake (3):
zd1211rw: Mark some data const
zd1211rw: Don't handle broken frames in monitor mode
zd1211rw: Add another ID for Linksys WUSBF54G
Jouni Malinen (1):
Update my email address from [email protected] to [email protected]
MAINTAINERS | 5 +++-- crypto/michael_mic.c | 4 ++-- drivers/net/wireless/hostap/hostap_ap.c | 4 ++-- drivers/net/wireless/hostap/hostap_cs.c | 2 +- drivers/net/wireless/hostap/hostap_hw.c | 4 ++-- drivers/net/wireless/hostap/hostap_main.c | 4 ++-- drivers/net/wireless/hostap/hostap_pci.c | 2 +- drivers/net/wireless/hostap/hostap_plx.c | 2 +- drivers/net/wireless/ipw2100.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_mac.c | 13 ++----------- drivers/net/wireless/zd1211rw/zd_rf.c | 2 +- drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_usb.c | 1 + include/linux/wireless.h | 2 +- include/net/ieee80211.h | 4 ++-- include/net/ieee80211_crypt.h | 4 ++-- net/ieee80211/ieee80211_crypt.c | 2 +- net/ieee80211/ieee80211_crypt_ccmp.c | 2 +- net/ieee80211/ieee80211_crypt_tkip.c | 2 +- net/ieee80211/ieee80211_crypt_wep.c | 2 +- net/ieee80211/ieee80211_module.c | 4 ++-- net/ieee80211/ieee80211_rx.c | 4 ++-- net/ieee80211/ieee80211_wx.c | 4 ++-- 24 files changed, 39 insertions(+), 46 deletions(-)
MAINTAINERS +3 -2
@@ -1537,8 +1537,9 @@ S: Supported HOST AP DRIVER P: Jouni Malinen -M: [email protected] -L: [email protected] +M: [email protected] +L: [email protected] (subscribers-only) +L: [email protected] W: http://hostap.epitest.fi/ S: Maintained
crypto/michael_mic.c +2 -2
@@ -3,7 +3,7 @@* * Michael MIC (IEEE 802.11i/TKIP) keyed digest * -* Copyright (c) 2004 Jouni Malinen <[email protected]> +* Copyright (c) 2004 Jouni Malinen <[email protected]> * * 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
@@ -173,4 +173,4 @@ module_exit(michael_mic_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("Michael MIC" ); -MODULE_AUTHOR ("Jouni Malinen <[email protected]>" ); +MODULE_AUTHOR ("Jouni Malinen <[email protected]>" );
drivers/net/wireless/hostap/hostap_ap.c +2 -2
@@ -1,8 +1,8 @@/* * Intersil Prism2 driver with Host AP (software access point) support * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> * * This file is to be included into hostap.c when S/W AP functionality is * compiled.
drivers/net/wireless/hostap/hostap_cs.c +1 -1
@@ -22,7 +22,7 @@#include "hostap_wlan.h" -static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ; +static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ;static dev_info_t dev_info ="hostap_cs" ;MODULE_AUTHOR ("Jouni Malinen" );
drivers/net/wireless/hostap/hostap_hw.c +2 -2
@@ -3,8 +3,8 @@* Intersil Prism2/2.5/3. * * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> * * 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
drivers/net/wireless/hostap/hostap_main.c +2 -2
@@ -3,8 +3,8 @@* Intersil Prism2/2.5/3 - hostap.o module, common routines * * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2005, Jouni Malinen <[email protected]> * * 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
drivers/net/wireless/hostap/hostap_pci.c +1 -1
@@ -20,7 +20,7 @@#include "hostap_wlan.h" -static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ; +static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ;static char *dev_info ="hostap_pci" ;
drivers/net/wireless/hostap/hostap_plx.c +1 -1
@@ -23,7 +23,7 @@#include "hostap_wlan.h" -static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ; +static char *version =PRISM2_VERSION " (Jouni Malinen <[email protected]>)" ;static char *dev_info ="hostap_plx" ;
drivers/net/wireless/ipw2100.c +2 -2
@@ -28,8 +28,8 @@ Portions of this file are based on the Host AP project, Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen - <[email protected]> - Copyright (c) 2002-2003, Jouni Malinen <[email protected]> + <[email protected]> + Copyright (c) 2002-2003, Jouni Malinen <[email protected]> Portions of ipw2100_mod_firmware_load, ipw2100_do_mod_firmware_load, and ipw2100_fw_load are loosely based on drivers/sound/sound_firmware.c
drivers/net/wireless/zd1211rw/zd_mac.c +2 -11
@@ -156,17 +156,8 @@ void zd_mac_clear(struct zd_mac *mac)static int reset_mode (struct zd_mac *mac) {struct ieee80211_device *ieee =zd_mac_to_ieee80211 (mac); -struct zd_ioreq32 ioreqs[] = { - {CR_RX_FILTER ,STA_RX_FILTER }, - {CR_SNIFFER_ON ,0U }, - }; - -if (ieee->iw_mode ==IW_MODE_MONITOR ) { - ioreqs[0 ].value =0xffffffff ; - ioreqs[1 ].value =0x1 ; - } - -return zd_iowrite32a (&mac->chip, ioreqs,ARRAY_SIZE (ioreqs)); +u32 filter = (ieee->iw_mode ==IW_MODE_MONITOR ) ? ~0 :STA_RX_FILTER ; +return zd_iowrite32 (&mac->chip,CR_RX_FILTER , filter); }int zd_mac_open (struct net_device *netdev)
drivers/net/wireless/zd1211rw/zd_rf.c +1 -1
@@ -23,7 +23,7 @@#include "zd_ieee80211.h" #include "zd_chip.h" -static const char *rfs[] = { +static const char *const rfs[] = { [0 ] ="unknown RF0" , [1 ] ="unknown RF1" , [UW2451_RF ] ="UW2451_RF" ,
drivers/net/wireless/zd1211rw/zd_rf_al7230b.c +2 -2
@@ -183,12 +183,12 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)const u32 *rv = chan_rv[channel-1 ];struct zd_chip *chip =zd_rf_to_chip (rf); -struct zd_ioreq16 ioreqs_1[] = { +static const struct zd_ioreq16 ioreqs_1[] = { {CR128 ,0x14 }, {CR129 ,0x12 }, {CR130 ,0x10 }, {CR38 ,0x38 }, {CR136 ,0xdf }, }; -struct zd_ioreq16 ioreqs_2[] = { +static const struct zd_ioreq16 ioreqs_2[] = {/* PLL_ON */ {CR251 ,0x3f }, {CR203 ,0x06 }, {CR240 ,0x08 },
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c +2 -2
@@ -21,7 +21,7 @@#include "zd_usb.h" #include "zd_chip.h" -static u32 rf2959_table[][2 ] = { +static const u32 rf2959_table[][2 ] = { RF_CHANNEL( 1) = { 0x181979, 0x1e6666 }, RF_CHANNEL( 2) = { 0x181989, 0x1e6666 }, RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf)static int rf2959_set_channel (struct zd_rf *rf,u8 channel) {int i, r; -u32 *rv = rf2959_table[channel-1 ]; +const u32 *rv = rf2959_table[channel-1 ];struct zd_chip *chip =zd_rf_to_chip (rf);for (i =0 ; i <2 ; i++) {
drivers/net/wireless/zd1211rw/zd_usb.c +1 -0
@@ -52,6 +52,7 @@ static struct usb_device_id usb_ids[] = { { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 }, { USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 }, + { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 }, /* ZD1211B */ { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B }, { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
include/linux/wireless.h +1 -1
@@ -186,7 +186,7 @@* - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * -* V17 to V18 (From Jouni Malinen <[email protected]>) +* V17 to V18 (From Jouni Malinen <[email protected]>) * ---------- * - Add support for WPA/WPA2 * - Add extended encoding configuration (SIOCSIWENCODEEXT and
include/net/ieee80211.h +2 -2
@@ -6,8 +6,8 @@* LAN access point) driver for Intersil Prism2/2.5/3. * * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> * * Adaption to a generic IEEE 802.11 stack by James Ketrenos * <[email protected]>
include/net/ieee80211_crypt.h +2 -2
@@ -3,8 +3,8 @@* for Intersil Prism2/2.5/3. * * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> * * Adaption to a generic IEEE 802.11 stack by James Ketrenos * <[email protected]>
net/ieee80211/ieee80211_crypt.c +1 -1
@@ -1,7 +1,7 @@/* * Host AP crypto routines * -* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> * Portions Copyright (C) 2004, Intel Corporation <[email protected]> * * This program is free software; you can redistribute it and/or modify
net/ieee80211/ieee80211_crypt_ccmp.c +1 -1
@@ -1,7 +1,7 @@/* * Host AP crypt: host-based CCMP encryption implementation for Host AP driver * -* Copyright (c) 2003-2004, Jouni Malinen <[email protected]> +* Copyright (c) 2003-2004, Jouni Malinen <[email protected]> * * 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
net/ieee80211/ieee80211_crypt_tkip.c +1 -1
@@ -1,7 +1,7 @@/* * Host AP crypt: host-based TKIP encryption implementation for Host AP driver * -* Copyright (c) 2003-2004, Jouni Malinen <[email protected]> +* Copyright (c) 2003-2004, Jouni Malinen <[email protected]> * * 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
net/ieee80211/ieee80211_crypt_wep.c +1 -1
@@ -1,7 +1,7 @@/* * Host AP crypt: host-based WEP encryption implementation for Host AP driver * -* Copyright (c) 2002-2004, Jouni Malinen <[email protected]> +* Copyright (c) 2002-2004, Jouni Malinen <[email protected]> * * 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
net/ieee80211/ieee80211_module.c +2 -2
@@ -5,8 +5,8 @@ Portions of this file are based on the WEP enablement code provided by the Host AP project hostap-drivers v0.1.3 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen - <[email protected]> - Copyright (c) 2002-2003, Jouni Malinen <[email protected]> + <[email protected]> + Copyright (c) 2002-2003, Jouni Malinen <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as
net/ieee80211/ieee80211_rx.c +2 -2
@@ -3,8 +3,8 @@* for Intersil Prism2/2.5/3 - hostap.o module, common routines * * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen -* <[email protected]> -* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> +* <[email protected]> +* Copyright (c) 2002-2003, Jouni Malinen <[email protected]> * Copyright (c) 2004-2005, Intel Corporation * * This program is free software; you can redistribute it and/or modify
net/ieee80211/ieee80211_wx.c +2 -2
@@ -5,8 +5,8 @@ Portions of this file are based on the WEP enablement code provided by the Host AP project hostap-drivers v0.1.3 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen - <[email protected]> - Copyright (c) 2002-2003, Jouni Malinen <[email protected]> + <[email protected]> + Copyright (c) 2002-2003, Jouni Malinen <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as
Signature · 2 lines
John W. Linville [email protected]
Re: Please pull 'upstream' branch of wireless-2.6
Quoted 33 lines · John W. Linville
The following changes since commit
b1944354101f15f4afeffd842e12c7d70fb7e822:
John W. Linville (1):
Merge branch 'upstream-fixes' into upstreamare found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstreamDaniel Drake (3):
zd1211rw: Mark some data const
zd1211rw: Don't handle broken frames in monitor mode
zd1211rw: Add another ID for Linksys WUSBF54GJouni Malinen (1):
Update my email address from [email protected] to [email protected]MAINTAINERS | 5 +++-- crypto/michael_mic.c | 4 ++-- drivers/net/wireless/hostap/hostap_ap.c | 4 ++-- drivers/net/wireless/hostap/hostap_cs.c | 2 +- drivers/net/wireless/hostap/hostap_hw.c | 4 ++-- drivers/net/wireless/hostap/hostap_main.c | 4 ++-- drivers/net/wireless/hostap/hostap_pci.c | 2 +- drivers/net/wireless/hostap/hostap_plx.c | 2 +- drivers/net/wireless/ipw2100.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_mac.c | 13 ++----------- drivers/net/wireless/zd1211rw/zd_rf.c | 2 +- drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_usb.c | 1 + include/linux/wireless.h | 2 +- include/net/ieee80211.h | 4 ++-- include/net/ieee80211_crypt.h | 4 ++--
Quoted 8 lines
net/ieee80211/ieee80211_crypt.c | 2 +- net/ieee80211/ieee80211_crypt_ccmp.c | 2 +- net/ieee80211/ieee80211_crypt_tkip.c | 2 +- net/ieee80211/ieee80211_crypt_wep.c | 2 +- net/ieee80211/ieee80211_module.c | 4 ++-- net/ieee80211/ieee80211_rx.c | 4 ++-- net/ieee80211/ieee80211_wx.c | 4 ++-- 24 files changed, 39 insertions(+), 46 deletions(-)
hrm, it doesn't seem to like my #upstream, can you wait a bit for kernel.org propagation, and then redo with these already merged? Also, please pull branch libertas into your #upstream.
Auto-merged MAINTAINERS
Auto-merged drivers/net/wireless/libertas/debugfs.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/libertas/debugfs.c Auto-merged include/net/ieee80211_radiotap.h
CONFLICT (content): Merge conflict in include/net/ieee80211_radiotap.h Automatic merge failed; fix conflicts and then commit the result.
Quoted 21 lines · John W. Linville
The following changes since commit
e0f2e3a06be513352cb4955313ed7e55909acd84:
Linus Torvalds (1):Linux 2.6.21-rc5are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstream-fixesDavid Woodhouse (1):
bcm43xx: Fix machine check on PPC for version 1 PHYJean Tourrilhes (2):
wext: Add missing ioctls to 64<->32 conversion WE-22 : prevent information leak on 64 bitLarry Finger (1):
bcm43xx: Fix code for confusion between PHY revision and PHY versionStefano Brivio (1):
bcm43xx: fixradio_set_tx_iq
Quoted 8 lines
drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 4 +- drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 12 ++-- fs/compat_ioctl.c | 9 +++ include/linux/wireless.h | 21 ++++++- include/net/iw_handler.h | 30 +++++++--- net/core/rtnetlink.c | 3 +- net/core/wireless.c | 82 ++++++++++++++++---------- 7 files changed, 108 insertions(+), 53 deletions(-)
pulled